gg-chromium.diff

--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ common_defines+=\
        enable_mdns=true \
        enable_nacl=false \
        enable_wayland_server=false \
-       enable_widevine=true \
+       enable_widevine=false \
        fieldtrial_testing_like_official_build=true \
        is_component_build=false \
        is_component_ffmpeg=true \
@@ -81,7 +81,7 @@ common_defines+=\
        use_system_libjpeg=false \
        rtc_enable_protobuf=false \
        rtc_use_h264=true \
-       is_clang=true \
+       is_clang=false \
        clang_base_path="/usr" \
        clang_use_chrome_plugins=false \
        use_lld=false \
@@ -90,7 +90,8 @@ common_defines+=\
        fatal_linker_warnings=false \
        target_os="linux" \
        current_os="linux" \
-       optimize_webui=false
+       optimize_webui=false \
+       linux_use_bundled_binutils=false

 ffmpeg_std_defines   += proprietary_codecs=false
 ffmpeg_extra_defines += proprietary_codecs=true ffmpeg_branding="Chrome"
 

--- a/components/bookmarks/browser/bookmark_storage.h
+++ b/components/bookmarks/browser/bookmark_storage.h
@@ -19,6 +19,7 @@
 #include "base/memory/weak_ptr.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/titled_url_index.h"
+#include "components/bookmarks/browser/url_index.h"

 namespace base {
 class SequencedTaskRunner;