Release 72.0.3626.73

Add missing reference to AV1 patch
Release 72.0.3626.68
2019-01-25 07:06:36 +01:00 · 2019-01-24 20:15:35 +01:00 · 2019-01-21 23:29:57 +01:00 · 2019-01-21 12:38:05 +01:00 · 2019-01-18 20:36:34 +01:00 · 2019-01-09 12:05:57 +01:00
123 changed files with 8410 additions and 3029 deletions
@@ -1,3 +1,41 @@
+# 72.0.3626.68
+* do not ignore save prompt for users without SD card (workaround for upstream wontfix https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
+* remove third_party/analytics patch (now fixed upstream in https://chromium.googlesource.com/chromium/src.git/+/64d6a56f094efbab83802c07ad3ddffa014f9903)
+* AV1 codec support
+
+# 71.0.3578.132
+* add patches from AndroidHardening project (fixes https://github.com/bromite/bromite/issues/226)
+
+# 71.0.3578.123
+* disable jumbo builds (fixes https://github.com/bromite/bromite/issues/216 and https://github.com/bromite/bromite/issues/219)
+* disable preview fetching
+* do not consider Android Jelly Bean unsupported
+
+# 71.0.3578.120
+* fix breakage of translate quick answers by anti-AMP (fixes https://github.com/bromite/bromite/issues/210)
+
+# 71.0.3578.115
+* add AdGuard DNS-over-HTTPS option
+* use green icon for SystemWebView
+
+# 71.0.3578.110
+
+# 71.0.3578.104
+* fix AMP links sanitisation; have it working for news as well (fixes https://github.com/bromite/bromite/issues/202)
+* revert upstream patch responsible for the broken save dialog prompt (upstream: https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
+
+# 71.0.3578.101
+
+# 71.0.3578.98
+* do not ask permissions for camera when importing bookmarks (fixes https://github.com/bromite/bromite/issues/200)
+
+# 71.0.3578.88
+* add proxy configuration page (see https://github.com/bromite/bromite/wiki/ProxyConfiguration)
+* use more recent versions in User-Agent (fixes https://github.com/bromite/bromite/issues/156)
+
+# 71.0.3578.85
+* fix blurry adaptive icon (fixes https://github.com/bromite/bromite/issues/197)
+
 # 71.0.3578.76

 # 71.0.3578.72
@@ -46,6 +46,8 @@ Projects which follow a strict approach on this are [Iridium](https://iridiumbro
 ## What is the SystemWebView?
 It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.

+See also [the wiki page](https://github.com/bromite/bromite/wiki/Installing-SystemWebView) for community-contributed installation instructions.
+
 ## How to enable DNS-over-HTTPS?

 See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
@@ -75,7 +77,8 @@ Yes, since version 69. While the desktop version of Chromium has an option to di

 * baked-in adblock engine with filters from EasyList, EasyPrivacy and others
 * remove click-tracking and AMP from search results
-* DNS-over-HTTPS support via Google, Cloudflare and Quad9 servers
+* DNS-over-HTTPS support via Google, Cloudflare, Quad9 and AdGuard servers
+* [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
 * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
 * chrome flags to disable custom intents and clear session on exit
 * always-incognito mode
@@ -85,12 +88,13 @@ Yes, since version 69. While the desktop version of Chromium has an option to di
 * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects

 ## Features not related to privacy
+* AV1 codec support
 * import/export bookmarks
 * allow playing videos in background tabs and disable pause on switching tabs
 * all codecs included (proprietary, open H.264 etc.)
 * built with official speed optimizations

-You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/patches
+You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/build/patches

 # Releases

@@ -133,6 +137,9 @@ The [Bromite main repository](https://github.com/bromite/bromite) contains tags

 Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.

+The GN args used to build Bromite are available here: [GN_ARGS](./build/GN_ARGS).
+The patches are to be applied second the order specified in the `patches_list.txt` file (you can use `git am`); the big file `adblock_entries.h` (containing all the AdBlock filters) needs to be copied under `src/net/url_request/`.
+
 # Credits

 * [Chromium project](https://www.chromium.org/Home) and developers
@@ -0,0 +1,31 @@
+android_channel="stable"
+blink_symbol_level=1
+dcheck_always_on=false
+debuggable_apks=false
+enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false
+enable_av1_decoder=true
+enable_hangout_services_extension=false
+enable_mdns=false
+enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true
+enable_nacl=false
+enable_nacl_nonsfi=false
+enable_remoting=false
+enable_reporting=false
+enable_resource_whitelist_generation=false
+enable_vr=false
+fieldtrial_testing_like_official_build=true
+is_component_build=false
+is_debug=false
+is_official_build=true
+jumbo_file_merge_limit=60
+safe_browsing_mode=0
+strip_absolute_paths_from_debug_symbols=true
+strip_debug_info=false
+symbol_level=1
+target_os="android"
+use_debug_fission=true
+use_errorprone_java_compiler=false
+use_jumbo_build=false
+use_official_google_api_keys=false
+use_openh264=true chrome_pgo_phase=0 full_wpo_on_official=true
+use_sysroot=false
@@ -0,0 +1,260 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 16 Dec 2018 15:24:19 +0100
+Subject: AV1 codec support
+
+libaom build fixes (requires -fPIC)
+Report AV1 as playable on Android
+---
+ media/base/mime_util_internal.cc                                    | 6 +++++-
+ third_party/libaom/BUILD.gn                                         | 6 ++++--
+ third_party/libaom/libaom_srcs.gni                                  | 5 +++++
+ .../source/config/linux/arm-neon-cpu-detect/config/aom_config.asm   | 2 +-
+ .../source/config/linux/arm-neon-cpu-detect/config/aom_config.h     | 2 +-
+ .../libaom/source/config/linux/arm-neon/config/aom_config.asm       | 2 +-
+ third_party/libaom/source/config/linux/arm-neon/config/aom_config.h | 2 +-
+ third_party/libaom/source/config/linux/arm/config/aom_config.asm    | 2 +-
+ third_party/libaom/source/config/linux/arm/config/aom_config.h      | 2 +-
+ third_party/libaom/source/config/linux/arm64/config/aom_config.asm  | 2 +-
+ third_party/libaom/source/config/linux/arm64/config/aom_config.h    | 2 +-
+ .../libaom/source/config/linux/generic/config/aom_config.asm        | 2 +-
+ third_party/libaom/source/config/linux/generic/config/aom_config.h  | 2 +-
+ third_party/libaom/source/config/linux/ia32/config/aom_config.asm   | 2 +-
+ third_party/libaom/source/config/linux/ia32/config/aom_config.h     | 2 +-
+ third_party/libaom/source/config/linux/x64/config/aom_config.asm    | 2 +-
+ third_party/libaom/source/config/linux/x64/config/aom_config.h      | 2 +-
+ 17 files changed, 28 insertions(+), 17 deletions(-)
+
+diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
+--- a/media/base/mime_util_internal.cc
+++ b/media/base/mime_util_internal.cc
+@@ -548,9 +548,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
+     case THEORA:
+       return false;
+ 
+-    // AV1 is not supported on Android yet.
+    // AV1 is supported on Android.
+     case AV1:
+#if BUILDFLAG(ENABLE_AV1_DECODER)
+      return true;
+#else
+       return false;
+#endif
+ 
+     // ----------------------------------------------------------------------
+     // The remaining codecs may be supported depending on platform abilities.
+diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
+--- a/third_party/libaom/BUILD.gn
+++ b/third_party/libaom/BUILD.gn
+@@ -74,7 +74,7 @@ if (enable_av1_decoder) {
+       sources = aom_dsp_common_asm_sse2
+       sources += aom_dsp_common_asm_ssse3
+       sources += aom_ports_asm_x86
+-      defines = [ "CHROMIUM" ]
+      defines = [ "CHROMIUM", "PIC" ]
+       include_dirs = libaom_include_dirs
+     }
+ 
+@@ -158,7 +158,7 @@ if (enable_av1_decoder) {
+       configs += [ "//build/config/compiler:no_chromium_code" ]
+       if (current_cpu == "arm") {
+         configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+-        cflags = [ "-mfpu=neon" ]
+        cflags = [ "-mfpu=neon", "-fPIC" ]
+       }
+       configs += [ ":libaom_config" ]
+       sources = aom_av1_common_intrin_neon
+@@ -198,6 +198,8 @@ if (enable_av1_decoder) {
+     if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
+         cpu_arch_full == "arm-neon-cpu-detect") {
+       deps += [ ":libaom_intrinsics_neon" ]
+      # will detect CPU
+      sources += aom_ports_arm_sources
+     }
+     if (is_android) {
+       deps += [ "//third_party/android_tools:cpu_features" ]
+diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
+--- a/third_party/libaom/libaom_srcs.gni
+++ b/third_party/libaom/libaom_srcs.gni
+@@ -479,6 +479,11 @@ aom_mem_sources = [
+ 
+ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]
+ 
+aom_ports_arm_sources = [
+  "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c",
+  "//third_party/libaom/source/libaom/aom_ports/arm.h",
+ ]
+
+ aom_rtcd_sources = [
+   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd_defs.pl",
+   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd.c",
+diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
+CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_REDUCED_ENCODER_BORDER equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 1
+diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
+#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REDUCED_ENCODER_BORDER 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
+diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
+CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_REDUCED_ENCODER_BORDER equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
+diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
+#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REDUCED_ENCODER_BORDER 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
+diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
+CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_REDUCED_ENCODER_BORDER equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
+diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/arm/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
+#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REDUCED_ENCODER_BORDER 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
+diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
+CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_REDUCED_ENCODER_BORDER equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
+diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
+#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REDUCED_ENCODER_BORDER 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
+diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
+CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_REDUCED_ENCODER_BORDER equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 1
+diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/generic/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
+#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REDUCED_ENCODER_BORDER 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
+diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
+@@ -35,7 +35,7 @@
+ %define CONFIG_NORMAL_TILE_MODE 1
+ %define CONFIG_ONE_PASS_SVM 0
+ %define CONFIG_OS_SUPPORT 1
+-%define CONFIG_PIC 0
+%define CONFIG_PIC 1
+ %define CONFIG_RD_DEBUG 0
+ %define CONFIG_REDUCED_ENCODER_BORDER 0
+ %define CONFIG_RUNTIME_CPU_DETECT 1
+diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.h b/third_party/libaom/source/config/linux/ia32/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
+#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REDUCED_ENCODER_BORDER 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
+diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm
+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
+@@ -35,7 +35,7 @@
+ %define CONFIG_NORMAL_TILE_MODE 1
+ %define CONFIG_ONE_PASS_SVM 0
+ %define CONFIG_OS_SUPPORT 1
+-%define CONFIG_PIC 0
+%define CONFIG_PIC 1
+ %define CONFIG_RD_DEBUG 0
+ %define CONFIG_REDUCED_ENCODER_BORDER 0
+ %define CONFIG_RUNTIME_CPU_DETECT 1
+diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/x64/config/aom_config.h
+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
+#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REDUCED_ENCODER_BORDER 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
+-- 
+2.11.0
+
@@ -52,7 +52,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
+@@ -33,548 +33,548 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
@@ -64,7 +64,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
+@@ -33,548 +33,548 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
@@ -63,7 +63,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
+@@ -33,548 +33,548 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
@@ -51,7 +51,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
+@@ -33,548 +33,548 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
@@ -5,25 +5,26 @@ Subject: Add a flag for DNS-over-HTTPS
 Allow selection between Google and Cloudflare endpoints.
 Serve DoH requests with maximum priority, remove traffic annotation.
 Reduce HTTP headers in DoH requests to bare minimum.
+Add AdGuard (default) endpoint

-See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt
+See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-14.txt
 ---
- chrome/browser/about_flags.cc                      | 13 ++++++++++
+ chrome/browser/about_flags.cc                      | 14 +++++++++++
 chrome/browser/flag_descriptions.cc                |  3 +++
 chrome/browser/flag_descriptions.h                 |  3 +++
 .../browser/net/system_network_context_manager.cc  | 16 ++++++-------
- .../common/network_features.cc                     |  6 +++--
- .../common/network_features.h                      |  4 +++-
+ .../common/network_features.cc                     |  7 ++++--
+ .../common/network_features.h                      |  5 +++-
 .../common/network_switch_list.h                   |  4 ++++
 net/base/load_flags_list.h                         |  6 +++++
 net/dns/dns_transaction.cc                         | 28 +++-------------------
 net/url_request/url_request_http_job.cc            | 26 ++++++++++++--------
- 10 files changed, 62 insertions(+), 47 deletions(-)
+ 10 files changed, 65 insertions(+), 47 deletions(-)

 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -461,6 +461,13 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = {
+@@ -427,6 +427,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = {
      base::size(kCCTModuleCache_ThirtyMinutes), nullptr},
 };
 
@@ -31,13 +32,14 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 +    {features::kDnsOverHttpsChoiceDefault, "", ""},
 +    {features::kDnsOverHttpsChoiceGoogle, switches::kDnsOverHttpsServer, "https://dns.google.com/experimental"},
 +    {features::kDnsOverHttpsChoiceCloudflare, switches::kDnsOverHttpsServer, "https://1.1.1.1/dns-query"},
-+    {features::kDnsOverHttpsChoiceQuad9, switches::kDnsOverHttpsServer, "https://9.9.9.9/dns-query"}
+    {features::kDnsOverHttpsChoiceQuad9, switches::kDnsOverHttpsServer, "https://9.9.9.9/dns-query"},
+    {features::kDnsOverHttpsChoiceAdGuard, switches::kDnsOverHttpsServer, "https://dns.adguard.com/dns-query"}
 +};
 +
 #endif  // OS_ANDROID
 
 const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
-@@ -3659,6 +3666,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3556,6 +3564,12 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(features::kAsyncDns)},
 #endif  // defined(OS_ANDROID)
 
@@ -53,7 +55,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2209,6 +2209,9 @@ const char kAutoFetchOnNetErrorPageDescription[] =
+@@ -2254,6 +2254,9 @@ const char kAutoFetchOnNetErrorPageDescription[] =
     "When enabled, and navigation fails with an offline error, schedule a "
     "fetch of the page when online again.";
 
@@ -66,7 +68,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1343,6 +1343,9 @@ extern const char kAsyncDnsDescription[];
+@@ -1352,6 +1352,9 @@ extern const char kAsyncDnsDescription[];
 extern const char kAutoFetchOnNetErrorPageName[];
 extern const char kAutoFetchOnNetErrorPageDescription[];
 
@@ -79,7 +81,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,7 @@
 #include "chrome/browser/component_updater/sth_set_component_installer.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
@@ -87,7 +89,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ssl/ssl_config_service_manager.h"
 #include "chrome/common/channel_info.h"
-@@ -389,15 +390,12 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+@@ -395,15 +396,12 @@ SystemNetworkContextManager::SystemNetworkContextManager(
                                     base::Value(ShouldEnableAsyncDns()));
   base::ListValue default_doh_servers;
   base::ListValue default_doh_server_methods;
@@ -112,31 +114,33 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
 --- a/components/network_session_configurator/common/network_features.cc
 +++ b/components/network_session_configurator/common/network_features.cc
-@@ -10,7 +10,9 @@ namespace features {
+@@ -8,7 +8,10 @@
 
- const base::Feature kChannelID{"channel-id", base::FEATURE_DISABLED_BY_DEFAULT};
+ namespace features {
 
 -const base::Feature kDnsOverHttps{"dns-over-https",
 -                                  base::FEATURE_DISABLED_BY_DEFAULT};
 +const char kDnsOverHttpsChoiceDefault[] = "Disabled",
 +                 kDnsOverHttpsChoiceGoogle[] = "Google",
 +                 kDnsOverHttpsChoiceCloudflare[] = "Cloudflare",
-+                 kDnsOverHttpsChoiceQuad9[] = "Quad9";
+                 kDnsOverHttpsChoiceQuad9[] = "Quad9",
+                 kDnsOverHttpsChoiceAdGuard[] = "AdGuard";
 
 }  // namespace features
 diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
 --- a/components/network_session_configurator/common/network_features.h
 +++ b/components/network_session_configurator/common/network_features.h
-@@ -13,9 +13,11 @@ namespace features {
- // Enables Channel ID.
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
+@@ -10,9 +10,12 @@
+ 
+ namespace features {
 
 -// Enabled DNS over HTTPS
 +// DNS over HTTPS server endpoint choices
 // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt).
 NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
 +NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kDnsOverHttpsChoiceDefault[],
-+   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[], kDnsOverHttpsChoiceQuad9[];
+   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[], kDnsOverHttpsChoiceQuad9[],
+   kDnsOverHttpsChoiceAdGuard[];
 
 }  // namespace features
 
@@ -157,8 +161,8 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
 diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
 --- a/net/base/load_flags_list.h
 +++ b/net/base/load_flags_list.h
-@@ -92,6 +92,12 @@ LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 14)
- LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 15)
+@@ -89,6 +89,12 @@ LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 13)
+ LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 14)
 
 // Indicates that this request is not to be migrated to a cellular network when
 +
@@ -168,7 +172,7 @@ diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
 +// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests."
 +LOAD_FLAG(MINIMAL_HEADERS, 1 << 18)
 // QUIC connection migration is enabled.
- LOAD_FLAG(DISABLE_CONNECTION_MIGRATION_TO_CELLULAR, 1 << 16)
+ LOAD_FLAG(DISABLE_CONNECTION_MIGRATION_TO_CELLULAR, 1 << 15)
 
 diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
 --- a/net/dns/dns_transaction.cc
@@ -225,7 +229,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -434,19 +434,23 @@ void URLRequestHttpJob::Start() {
+@@ -422,19 +422,23 @@ void URLRequestHttpJob::Start() {
   // plugin could set a referrer although sending the referrer is inhibited.
   request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
 
@@ -254,7 +258,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
 
   AddExtraHeaders();
   AddCookieHeaderAndStart();
-@@ -664,10 +668,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
+@@ -647,10 +651,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
           HttpRequestHeaders::kAcceptEncoding)) {
     // Advertise "br" encoding only if transferred data is opaque to proxy.
     bool advertise_brotli = false;
@@ -271,7 +275,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
       }
     }
 
-@@ -684,7 +690,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
+@@ -667,7 +673,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
                                           advertised_encodings);
   }
 
@@ -19,18 +19,18 @@ clicked links to launch as incognito.
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -23,6 +23,11 @@
-         android:summary="@string/close_tabs_on_exit_summary"
-         android:defaultValue="false" />
-     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+@@ -35,6 +35,11 @@
+         android:key="usage_and_crash_reports"
+         android:title="@string/usage_and_crash_reports_title_legacy"
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.UsageAndCrashReportsPreferenceFragment" />
+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
 +        android:key="always_incognito"
 +        android:title="@string/always_incognito_title"
 +        android:summary="@string/always_incognito_summary"
 +        android:defaultValue="false" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
-         android:key="safe_browsing_extended_reporting"
-         android:title="@string/safe_browsing_extended_reporting_title"
-         android:summary="@string/safe_browsing_extended_reporting_summary" />
+     <Preference
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
+         android:key="do_not_track"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 new file mode 100644
 --- /dev/null
@@ -111,7 +111,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -249,6 +249,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -253,6 +253,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
 
     // Observes when sync becomes ready to create the mContextReporter.
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
     private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
 
     private ChromeFullscreenManager mFullscreenManager;
-@@ -1707,6 +1708,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1690,6 +1691,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
             throw new IllegalStateException(
                     "Attempting to access TabCreator before initialization");
         }
@@ -175,8 +175,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 +import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
- import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
-@@ -43,6 +44,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+ import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabPanel;
+@@ -44,6 +45,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
     private static final String TAG = "CCMenuPopulator";
     private final ContextMenuItemDelegate mDelegate;
     private final @ContextMenuMode int mMode;
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 
     /**
      * Defines the Groups of each Context Menu Item
-@@ -246,7 +248,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -252,7 +254,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
             if (FirstRunStatus.getFirstRunFlowComplete() && mMode == ContextMenuMode.NORMAL
                     && !isEmptyUrl(params.getUrl())
                     && UrlUtilities.isAcceptedScheme(params.getUrl())) {
@@ -286,7 +286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -691,6 +691,12 @@ CHAR-LIMIT guidelines:
+@@ -688,6 +688,12 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Body text for Chrome setting under 'Help Improve Safe Browsing'. This feature sends small amounts of data to Google about potentially-dangerous pages to help Safe Browsing improve Chrome's protection against malware and phishing.">
         Sends some system information and page content to Google
       </message>
@@ -302,8 +302,8 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 --- a/chrome/android/java_sources.gni
 +++ b/chrome/android/java_sources.gni
-@@ -8,6 +8,7 @@ import("//device/vr/buildflags/buildflags.gni")
- import("//chrome/android/feed/feed_java_sources.gni")
+@@ -8,6 +8,7 @@ import("//components/offline_pages/buildflags/features.gni")
+ import("//device/vr/buildflags/buildflags.gni")
 
 chrome_java_sources = [
 +  "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java",
@@ -331,7 +331,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -224,6 +224,12 @@ CHAR-LIMIT guidelines:
+@@ -227,6 +227,12 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SEARCH" desc="The label for a search button.">
         Search
       </message>
@@ -347,7 +347,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -149,6 +149,10 @@ jumbo_split_static_library("browser") {
+@@ -150,6 +150,10 @@ jumbo_split_static_library("browser") {
     "bitmap_fetcher/bitmap_fetcher_service.h",
     "bitmap_fetcher/bitmap_fetcher_service_factory.cc",
     "bitmap_fetcher/bitmap_fetcher_service_factory.h",
@@ -358,7 +358,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
     "bookmarks/bookmark_model_factory.cc",
     "bookmarks/bookmark_model_factory.h",
     "bookmarks/bookmark_stats.cc",
-@@ -2586,8 +2590,6 @@ jumbo_split_static_library("browser") {
+@@ -2614,8 +2618,6 @@ jumbo_split_static_library("browser") {
       "banners/app_banner_infobar_delegate_desktop.h",
       "banners/app_banner_manager_desktop.cc",
       "banners/app_banner_manager_desktop.h",
@@ -367,7 +367,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
       "certificate_viewer.h",
       "chrome_browser_field_trials_desktop.cc",
       "chrome_browser_field_trials_desktop.h",
-@@ -2678,8 +2680,6 @@ jumbo_split_static_library("browser") {
+@@ -2704,8 +2706,6 @@ jumbo_split_static_library("browser") {
       "importer/importer_uma.h",
       "importer/in_process_importer_bridge.cc",
       "importer/in_process_importer_bridge.h",
@@ -401,7 +401,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
- #include "chrome/browser/signin/signin_manager_factory.h"
+ #include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 +#include "chrome/common/importer/imported_bookmark_entry.h"
 +#include "chrome/common/importer/importer_data_types.h"
@@ -409,21 +409,20 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
-@@ -30,11 +41,14 @@
+@@ -30,10 +41,13 @@
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/query_parser/query_parser.h"
 +#include "components/search_engines/template_url.h"
- #include "components/signin/core/browser/signin_manager.h"
 #include "components/undo/bookmark_undo_service.h"
 #include "components/undo/undo_manager.h"
 +#include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/BookmarkBridge_jni.h"
 +#include "ui/android/window_android.h"
+ #include "services/identity/public/cpp/identity_manager.h"
 
 using base::android::AttachCurrentThread;
- using base::android::ConvertUTF8ToJavaString;
@@ -53,6 +67,57 @@ using bookmarks::BookmarkPermanentNode;
 using bookmarks::BookmarkType;
 using content::BrowserThread;
@@ -731,7 +730,7 @@ diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -442,6 +442,9 @@ static_library("common") {
+@@ -441,6 +441,9 @@ static_library("common") {
     sources += [
       "media/chrome_media_drm_bridge_client.cc",
       "media/chrome_media_drm_bridge_client.h",
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -55,6 +55,11 @@
+@@ -43,6 +43,11 @@
         android:title="@string/clear_browsing_data_title"
         android:summary="@string/clear_browsing_data_summary"
         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
@@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+@@ -41,6 +41,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -49,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 import org.chromium.chrome.browser.searchwidget.SearchActivity;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
-@@ -272,6 +273,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -275,6 +276,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
      */
     public static boolean isCustomTabIntent(Intent intent) {
         if (intent == null) return false;
@@ -60,41 +60,41 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-@@ -42,6 +42,7 @@ public class PrivacyPreferences extends PreferenceFragment
-             "safe_browsing_extended_reporting";
-     private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
-             "safe_browsing_scout_reporting";
+@@ -38,6 +38,7 @@ public class PrivacyPreferences extends PreferenceFragment
+         implements OnPreferenceChangeListener {
+     private static final String PREF_NAVIGATION_ERROR = "navigation_error";
+     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
 +    public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
-     private static final String PREF_SAFE_BROWSING = "safe_browsing";
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
-@@ -135,6 +136,11 @@ public class PrivacyPreferences extends PreferenceFragment
-                     ? PREF_SAFE_BROWSING_EXTENDED_REPORTING : PREF_SAFE_BROWSING_SCOUT_REPORTING;
-         preferenceScreen.removePreference(findPreference(extended_reporting_pref_to_remove));
+     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
+@@ -101,6 +102,11 @@ public class PrivacyPreferences extends PreferenceFragment
+         navigationErrorPref.setOnPreferenceChangeListener(this);
+         navigationErrorPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
 +        ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
 +                (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
 +        allowCustomTabIntentsPref.setOnPreferenceChangeListener(this);
 +        allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 +
-         ChromeBaseCheckBoxPreference safeBrowsingPref =
-                 (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
-         safeBrowsingPref.setOnPreferenceChangeListener(this);
-@@ -154,6 +160,10 @@ public class PrivacyPreferences extends PreferenceFragment
-                    || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
-             PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
-                     (boolean) newValue);
+         ChromeBaseCheckBoxPreference searchSuggestionsPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
+         searchSuggestionsPref.setOnPreferenceChangeListener(this);
+@@ -123,6 +129,10 @@ public class PrivacyPreferences extends PreferenceFragment
+             recordNetworkPredictionEnablingUMA((boolean) newValue);
+         } else if (PREF_NAVIGATION_ERROR.equals(key)) {
+             PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
 +        } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
-         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
-             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
-             recordNetworkPredictionEnablingUMA((boolean) newValue);
+         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
+             PrefServiceBridge.getInstance().setBoolean(
+                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3875,6 +3875,13 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
+@@ -3972,6 +3972,13 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
         Browse
       </message>
 
@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2100,6 +2100,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2096,6 +2096,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
             RecordUserAction.record("MobileMenuSettings");
         } else if (id == R.id.show_menu) {
             showAppMenuForKeyboardEvent();
@@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2992,6 +2992,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3050,6 +3050,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
         Settings
       </message>
@@ -18,7 +18,7 @@ with limited CPU/memory resources and it is disabled by default.
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -963,6 +963,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+@@ -912,6 +912,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
      net::kEffectiveConnectionType4G},
 };
 
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 // Ensure that all effective connection types returned by Network Quality
 // Estimator (NQE) are also exposed via flags.
 static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
-@@ -2606,6 +2611,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2495,6 +2500,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kMaterialDesignIncognitoNTPName,
      flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1142,6 +1142,10 @@ const char kMaterialDesignIncognitoNTPDescription[] =
+@@ -1231,6 +1231,10 @@ const char kMaterialDesignIncognitoNTPDescription[] =
     "If enabled, the Incognito New Tab page uses the new material design with "
     "a better readable text.";
 
@@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -710,6 +710,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
+@@ -748,6 +748,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
 extern const char kMaterialDesignIncognitoNTPName[];
 extern const char kMaterialDesignIncognitoNTPDescription[];
 
@@ -77,9 +77,9 @@ diff --git a/components/network_session_configurator/common/network_features.cc
 +const char kMaxConnectionsPerHostChoiceDefault[] = "6",
 +                 kMaxConnectionsPerHostChoice15[] = "15";
 +
- const base::Feature kChannelID{"channel-id", base::FEATURE_DISABLED_BY_DEFAULT};
- 
 const char kDnsOverHttpsChoiceDefault[] = "Disabled",
+                  kDnsOverHttpsChoiceGoogle[] = "Google",
+                  kDnsOverHttpsChoiceCloudflare[] = "Cloudflare",
 diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
 --- a/components/network_session_configurator/common/network_features.h
 +++ b/components/network_session_configurator/common/network_features.h
@@ -91,9 +91,9 @@ diff --git a/components/network_session_configurator/common/network_features.h b
 +                 kMaxConnectionsPerHostChoice6[],
 +                 kMaxConnectionsPerHostChoice15[];
 +
- // Enables Channel ID.
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
- 
+ // DNS over HTTPS server endpoint choices
+ // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt).
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
 diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
 --- a/components/network_session_configurator/common/network_switch_list.h
 +++ b/components/network_session_configurator/common/network_switch_list.h
@@ -130,7 +130,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
 
 namespace net {
 
-@@ -316,6 +319,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -314,6 +317,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
 int ClientSocketPoolManager::max_sockets_per_group(
     HttpNetworkSession::SocketPoolType pool_type) {
   DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
@@ -13,7 +13,7 @@ Disable it by default on Android as it is everywhere else
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3439,6 +3439,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3330,6 +3330,11 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(features::kUseGoogleLocalNtp)},
 #endif  // !defined(OS_ANDROID)
 
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -759,6 +759,11 @@ const char kEnablePictureInPictureName[] = "Enable Picture-in-Picture.";
+@@ -791,6 +791,11 @@ const char kEnablePictureInPictureName[] = "Enable Picture-in-Picture.";
 const char kEnablePictureInPictureDescription[] =
     "Enable the Picture-in-Picture feature for videos.";
 
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -470,6 +470,9 @@ extern const char kOOPHPStackModePseudo[];
+@@ -479,6 +479,9 @@ extern const char kOOPHPStackModePseudo[];
 extern const char kEnablePictureInPictureName[];
 extern const char kEnablePictureInPictureDescription[];
 
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -221,11 +221,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
+@@ -217,11 +217,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
 // when in background.
 const base::Feature kResumeBackgroundVideo {
   "resume-background-video",
@@ -68,7 +68,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 +   base::FEATURE_DISABLED_BY_DEFAULT
 };
 
- // Display the Cast overlay button on the media controls.
+ // Enable Media Capabilities with finch-parameters.
 -- 
 2.11.0

@@ -14,7 +14,7 @@ Subject: Add flag to disable IPv6 probes
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3498,6 +3498,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3382,6 +3382,11 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(features::kEnableVirtualKeyboardUkm)},
 #endif  // OS_CHROMEOS
 
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -763,6 +763,10 @@ const char kOOPHPStackModeNative[] = "Native";
+@@ -795,6 +795,10 @@ const char kOOPHPStackModeNative[] = "Native";
 const char kOOPHPStackModeNativeWithThreadNames[] = "Native with thread names";
 const char kOOPHPStackModePseudo[] = "Trace events";
 
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -473,6 +473,9 @@ extern const char kOOPHPStackModeNative[];
+@@ -482,6 +482,9 @@ extern const char kOOPHPStackModeNative[];
 extern const char kOOPHPStackModeNativeWithThreadNames[];
 extern const char kOOPHPStackModePseudo[];
 
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
 --- a/net/dns/host_resolver_impl.cc
 +++ b/net/dns/host_resolver_impl.cc
-@@ -76,6 +76,7 @@
+@@ -78,6 +78,7 @@
 #include "net/log/net_log_with_source.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/datagram_client_socket.h"
@@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
 #include "url/url_canon_ip.h"
 
 #if BUILDFLAG(ENABLE_MDNS)
-@@ -2719,8 +2720,13 @@ bool HostResolverImpl::IsIPv6Reachable(const NetLogWithSource& net_log) {
+@@ -2773,8 +2774,13 @@ bool HostResolverImpl::IsIPv6Reachable(const NetLogWithSource& net_log) {
   bool cached = true;
   if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
       kIPv6ProbePeriodMs) {
@@ -102,7 +102,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
 COMPONENT_EXPORT(NETWORK_CPP)
 +extern const base::Feature kIPv6Probing;
 +COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kOutOfBlinkCORS;
+ extern const base::Feature kOutOfBlinkCors;
 COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kReporting;
 -- 
@@ -20,7 +20,7 @@ legacy acceleration events.
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3005,6 +3005,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2900,6 +2900,12 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-generic-sensor", flag_descriptions::kEnableGenericSensorName,
      flag_descriptions::kEnableGenericSensorDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kGenericSensor)},
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -551,6 +551,14 @@ const char kEnableGenericSensorDescription[] =
+@@ -567,6 +567,14 @@ const char kEnableGenericSensorDescription[] =
     "Accelerometer, LinearAccelerationSensor, Gyroscope, "
     "AbsoluteOrientationSensor and RelativeOrientationSensor interfaces.";
 
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -362,6 +362,12 @@ extern const char kEnableEnumeratingAudioDevicesDescription[];
+@@ -368,6 +368,12 @@ extern const char kEnableEnumeratingAudioDevicesDescription[];
 extern const char kEnableGenericSensorName[];
 extern const char kEnableGenericSensorDescription[];
 
@@ -70,20 +70,20 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -143,6 +143,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
-   if (command_line.HasSwitch(switches::kDisableSharedWorkers))
-     WebRuntimeFeatures::EnableSharedWorker(false);
+@@ -145,6 +145,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
+       base::FeatureList::IsEnabled(features::kSharedArrayBuffer) ||
+       base::FeatureList::IsEnabled(features::kWebAssemblyThreads));
 
 +  WebRuntimeFeatures::EnableDeviceMotion(base::FeatureList::IsEnabled(features::kDeviceMotion));
 +  WebRuntimeFeatures::EnableDeviceOrientation(base::FeatureList::IsEnabled(features::kDeviceOrientation));
 +
-   if (command_line.HasSwitch(switches::kDisableSpeechAPI))
-     WebRuntimeFeatures::EnableScriptedSpeech(false);
+   if (command_line.HasSwitch(switches::kDisableSharedWorkers))
+     WebRuntimeFeatures::EnableSharedWorker(false);
 
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -570,6 +570,16 @@ const base::Feature kWebRtcHideLocalIpsWithMdns{
+@@ -598,6 +598,16 @@ const base::Feature kWebRtcHideLocalIpsWithMdns{
 // https://wicg.github.io/webusb
 const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT};
 
@@ -103,7 +103,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -152,6 +152,8 @@ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[];
+@@ -156,6 +156,8 @@ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[];
 CONTENT_EXPORT extern const char kWebXrRenderPathParamValueSharedBuffer[];
 #endif  // defined(OS_ANDROID)
 
@@ -115,7 +115,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co
 diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -85,6 +85,8 @@ class WebRuntimeFeatures {
+@@ -97,6 +97,8 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableCSSFragmentIdentifiers(bool);
   BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
   BLINK_PLATFORM_EXPORT static void EnableDatabase(bool);
@@ -146,7 +146,7 @@ diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_p
 diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -136,6 +136,14 @@ void WebRuntimeFeatures::EnableDatabase(bool enable) {
+@@ -152,6 +152,14 @@ void WebRuntimeFeatures::EnableDatabase(bool enable) {
   RuntimeEnabledFeatures::SetDatabaseEnabled(enable);
 }
 
@@ -164,7 +164,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -357,6 +357,14 @@
+@@ -371,6 +371,14 @@
       status: "stable",
     },
     {
@@ -75,7 +75,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2195,6 +2195,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2196,6 +2196,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
             final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
             currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
             RecordUserAction.record("MobileMenuRequestDesktopSite");
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1718,6 +1718,14 @@ public class ChromeTabbedActivity
+@@ -1709,6 +1709,14 @@ public class ChromeTabbedActivity
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.banners.AppBannerManager;
-@@ -209,6 +210,8 @@ public class AppMenuPropertiesDelegate {
+@@ -197,6 +198,8 @@ public class AppMenuPropertiesDelegate {
 
             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
 
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
             // Only display reader mode settings menu option if the current page is in reader mode.
             menu.findItem(R.id.reader_mode_prefs_id)
                     .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
-@@ -448,6 +451,41 @@ public class AppMenuPropertiesDelegate {
+@@ -450,6 +453,41 @@ public class AppMenuPropertiesDelegate {
     }
 
     /**
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2977,6 +2977,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3035,6 +3035,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
         Find in page
       </message>
@@ -13,7 +13,7 @@ Subject: Add option to not persist tabs across sessions
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -66,6 +66,9 @@
+@@ -67,6 +67,9 @@
     <!-- TODO(peconn): Add help section. -->
     <!-- <string name="help_context_suggestions">mobile_content_suggestions</string> -->
 
@@ -26,8 +26,8 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -18,6 +18,11 @@
-         android:summary="@string/search_suggestions_summary"
+@@ -13,6 +13,11 @@
+         android:summary="@string/navigation_error_summary"
         android:defaultValue="true" />
     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
 +        android:key="close_tabs_on_exit"
@@ -35,13 +35,13 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 +        android:summary="@string/close_tabs_on_exit_summary"
 +        android:defaultValue="false" />
 +    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
-         android:key="safe_browsing_extended_reporting"
-         android:title="@string/safe_browsing_extended_reporting_title"
-         android:summary="@string/safe_browsing_extended_reporting_summary" />
+         android:key="search_suggestions"
+         android:title="@string/search_suggestions_title"
+         android:summary="@string/search_suggestions_summary"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1030,8 +1030,10 @@ public class ChromeTabbedActivity
+@@ -1016,8 +1016,10 @@ public class ChromeTabbedActivity
             boolean hadCipherData =
                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
 
@@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
-@@ -47,6 +49,7 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -42,6 +44,7 @@ public class PrivacyPreferences extends PreferenceFragment
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
@@ -80,19 +80,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
     private static final String PREF_DO_NOT_TRACK = "do_not_track";
     private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
-@@ -146,6 +149,11 @@ public class PrivacyPreferences extends PreferenceFragment
-         safeBrowsingPref.setOnPreferenceChangeListener(this);
-         safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+@@ -91,6 +94,11 @@ public class PrivacyPreferences extends PreferenceFragment
+         preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
+         preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
 
 +        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
 +                (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
 +        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
 +        closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 +
-         updateSummaries();
-     }
- 
-@@ -172,6 +180,12 @@ public class PrivacyPreferences extends PreferenceFragment
+         ChromeBaseCheckBoxPreference networkPredictionPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_NETWORK_PREDICTIONS);
+         networkPredictionPref.setChecked(prefServiceBridge.getNetworkPredictionEnabled());
+@@ -136,6 +144,12 @@ public class PrivacyPreferences extends PreferenceFragment
         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
             PrefServiceBridge.getInstance().setBoolean(
                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3765,6 +3765,12 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
+@@ -3853,6 +3853,12 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
       <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
         IMAGE
       </message>
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/androi
 --- a/chrome/android/java/res/xml/website_preferences.xml
 +++ b/chrome/android/java/res/xml/website_preferences.xml
@@ -26,6 +26,13 @@
-         android:summary="@string/allow_third_party_cookies_summary"
+         android:summary="@string/block_third_party_cookies_summary"
         android:defaultValue="true"
         android:persistent="false" />
 +    <!-- A toggle for cookies to be saved only until session exit, only shown for the Cookies category. -->
@@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
     /**
      * @return Whether third-party cookie blocking is configured by policy
      */
-@@ -638,6 +642,10 @@ public class PrefServiceBridge {
+@@ -631,6 +635,10 @@ public class PrefServiceBridge {
         nativeSetBlockThirdPartyCookiesEnabled(enabled);
     }
 
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
     public void setDoNotTrackEnabled(boolean enabled) {
         nativeSetDoNotTrackEnabled(enabled);
     }
-@@ -1086,6 +1094,7 @@ public class PrefServiceBridge {
+@@ -1079,6 +1087,7 @@ public class PrefServiceBridge {
     private native boolean nativeGetAutoplayEnabled();
     private native boolean nativeGetBackgroundSyncEnabled();
     private native boolean nativeGetBlockThirdPartyCookiesEnabled();
@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
     private native boolean nativeGetBlockThirdPartyCookiesManaged();
     private native boolean nativeGetRememberPasswordsEnabled();
     private native boolean nativeGetPasswordManagerAutoSigninEnabled();
-@@ -1132,6 +1141,7 @@ public class PrefServiceBridge {
+@@ -1125,6 +1134,7 @@ public class PrefServiceBridge {
     private native void nativeSetAutoplayEnabled(boolean enabled);
     private native void nativeSetAllowCookiesEnabled(boolean enabled);
     private native void nativeSetBackgroundSyncEnabled(boolean enabled);
@@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
-@@ -110,6 +110,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -121,6 +121,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
 
     // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
     public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
     public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
     public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
     private static final String ADD_EXCEPTION_KEY = "add_exception";
-@@ -438,6 +439,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -440,6 +441,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
 
                 if (type == SiteSettingsCategory.Type.COOKIES) {
                     updateThirdPartyCookiesCheckBox();
@@ -101,16 +101,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
                 } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
                     updateNotificationsVibrateCheckBox();
                 }
-@@ -476,6 +478,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -478,6 +480,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             prefServiceBridge.setContentSetting(
+                     mCategory.getContentSettingsType(), setting.toInt());
             getInfoForOrigins();
-         } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
-             prefServiceBridge.setBlockThirdPartyCookiesEnabled(!((boolean) newValue));
 +        } else if (COOKIES_SESSION_ONLY_TOGGLE_KEY.equals(preference.getKey())) {
 +            prefServiceBridge.setCookiesSessionOnlyEnabled((boolean) newValue);
+         } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
+             prefServiceBridge.setBlockThirdPartyCookiesEnabled(((boolean) newValue));
         } else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
-             prefServiceBridge.setNotificationsVibrateEnabled((boolean) newValue);
-         }
-@@ -738,6 +742,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -767,6 +771,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
         TriStateSiteSettingsPreference triStateToggle =
                 (TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
         Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
@@ -119,16 +119,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
         Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
         Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
         PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
-@@ -752,6 +758,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
-             screen.removePreference(binaryToggle);
-             screen.removePreference(triStateToggle);
+@@ -797,6 +803,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+ 
+         if (hideSecondaryToggles) {
             screen.removePreference(thirdPartyCookies);
 +            screen.removePreference(cookiesSessionOnly);
             screen.removePreference(notificationsVibrate);
             screen.removePreference(explainProtectedMediaKey);
             screen.removePreference(allowedGroup);
-@@ -787,12 +794,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
-             configureBinaryToggle(binaryToggle, contentType);
+@@ -806,12 +813,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             return;
         }
 
 -        // Configure/hide the third-party cookie toggle, as needed.
@@ -144,7 +144,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
         }
 
         // Configure/hide the notifications vibrate toggle, as needed.
-@@ -878,6 +888,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -916,6 +926,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
                 preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
     }
 
@@ -163,9 +163,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -882,6 +882,12 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_ALLOW_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Allow Third Party Cookies preference">
-         Third-party websites can save and read cookie data
+@@ -879,6 +879,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_BLOCK_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Block Third Party Cookies preference">
+         Prevent third-party websites from saving and reading cookie data
       </message>
 +      <message name="IDS_ALLOW_COOKIES_SESSION_ONLY_TITLE" desc="Title for Allow Cookies Session Only preference">
 +        Keep cookies only until you quit your browser
@@ -197,7 +197,7 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
 static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-@@ -774,6 +785,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
+@@ -767,6 +778,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
   GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
 }
 
@@ -0,0 +1,745 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 18 Sep 2018 08:06:14 +0200
+Subject: Allow building without safebrowsing for Android
+
+Fix build from scratch (issue found by nikolowry)
+---
+ .../android/java/res/xml/privacy_preferences.xml   |  8 -----
+ .../preferences/privacy/PrivacyPreferences.java    | 40 ----------------------
+ .../chrome_browsing_data_remover_delegate.cc       | 10 ------
+ chrome/browser/chrome_content_browser_client.cc    | 14 +-------
+ .../file_type_policies_component_installer.cc      |  2 ++
+ .../download/chrome_download_manager_delegate.cc   | 14 ++++++--
+ .../download/chrome_download_manager_delegate.h    |  6 ++++
+ chrome/browser/download/download_item_model.cc     | 10 ++++++
+ chrome/browser/download/download_item_model.h      |  4 +++
+ chrome/browser/download/download_prefs.cc          |  4 +++
+ .../browser/download/download_target_determiner.cc | 18 ++++++++++
+ .../browser/download/download_target_determiner.h  |  6 ++++
+ chrome/browser/download/download_target_info.cc    |  4 +++
+ chrome/browser/download/download_target_info.h     |  4 +++
+ chrome/browser/download/download_ui_model.cc       |  4 +++
+ chrome/browser/download/download_ui_model.h        |  4 +++
+ .../chrome_resource_dispatcher_host_delegate.cc    |  4 +++
+ chrome/browser/net/chrome_network_delegate.cc      | 35 ++-----------------
+ 18 files changed, 85 insertions(+), 106 deletions(-)
+
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -18,14 +18,6 @@
+         android:summary="@string/search_suggestions_summary"
+         android:defaultValue="true" />
+     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+-        android:key="safe_browsing_scout_reporting"
+-        android:title="@string/safe_browsing_scout_reporting_title"
+-        android:summary="@string/safe_browsing_scout_reporting_summary" />
+-    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+-        android:key="safe_browsing"
+-        android:title="@string/safe_browsing_title"
+-        android:summary="@string/safe_browsing_summary" />
+-    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+         android:key="network_predictions"
+         android:title="@string/network_predictions_title"
+         android:summary="@string/network_predictions_summary"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+@@ -38,9 +38,6 @@ public class PrivacyPreferences extends PreferenceFragment
+         implements OnPreferenceChangeListener {
+     private static final String PREF_NAVIGATION_ERROR = "navigation_error";
+     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
+-    private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
+-            "safe_browsing_scout_reporting";
+-    private static final String PREF_SAFE_BROWSING = "safe_browsing";
+     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
+     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
+     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
+@@ -74,8 +71,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             // Remove preferences that were migrated to SyncAndServicesPreferences.
+             preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
+             preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
+-            preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING));
+-            preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING));
+             preferenceScreen.removePreference(findPreference(PREF_NETWORK_PREDICTIONS));
+             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
+             preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
+@@ -115,17 +110,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
+         }
+ 
+-        // Listen to changes to the Extended Reporting pref.
+-        ChromeBaseCheckBoxPreference scoutReportingPref =
+-                (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING);
+-        scoutReportingPref.setOnPreferenceChangeListener(this);
+-        scoutReportingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-
+-        ChromeBaseCheckBoxPreference safeBrowsingPref =
+-                (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
+-        safeBrowsingPref.setOnPreferenceChangeListener(this);
+-        safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-
+         updateSummaries();
+     }
+ 
+@@ -134,11 +118,6 @@ public class PrivacyPreferences extends PreferenceFragment
+         String key = preference.getKey();
+         if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
+-        } else if (PREF_SAFE_BROWSING.equals(key)) {
+-            PrefServiceBridge.getInstance().setSafeBrowsingEnabled((boolean) newValue);
+-        } else if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
+-            PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
+-                    (boolean) newValue);
+         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
+             recordNetworkPredictionEnablingUMA((boolean) newValue);
+@@ -187,19 +166,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
+         }
+ 
+-        CheckBoxPreference extendedReportingPref =
+-                (CheckBoxPreference) findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING);
+-        if (extendedReportingPref != null) {
+-            extendedReportingPref.setChecked(
+-                    prefServiceBridge.isSafeBrowsingExtendedReportingEnabled());
+-        }
+-
+-        CheckBoxPreference safeBrowsingPref =
+-                (CheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
+-        if (safeBrowsingPref != null) {
+-            safeBrowsingPref.setChecked(prefServiceBridge.isSafeBrowsingEnabled());
+-        }
+-
+         CheckBoxPreference canMakePaymentPref =
+                 (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
+         if (canMakePaymentPref != null) {
+@@ -236,12 +202,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+                 return prefs.isSearchSuggestManaged();
+             }
+-            if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
+-                return prefs.isSafeBrowsingExtendedReportingManaged();
+-            }
+-            if (PREF_SAFE_BROWSING.equals(key)) {
+-                return prefs.isSafeBrowsingManaged();
+-            }
+             if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+                 return prefs.isNetworkPredictionManaged();
+             }
+diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+@@ -242,16 +242,6 @@ bool DoesOriginMatchEmbedderMask(int origin_type_mask,
+   return false;
+ }
+ 
+-// Callback for when cookies have been deleted. Invokes NotifyIfDone.
+-// Receiving |cookie_manager| as a parameter so that the receive pipe is
+-// not deleted before the response is received.
+-void OnClearedCookies(base::OnceClosure done,
+-                      network::mojom::CookieManagerPtr cookie_manager,
+-                      uint32_t num_deleted) {
+-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  std::move(done).Run();
+-}
+-
+ }  // namespace
+ 
+ ChromeBrowsingDataRemoverDelegate::ChromeBrowsingDataRemoverDelegate(
+diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
+--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -4990,19 +4990,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
+     content::ResourceContext* resource_context) {
+   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ 
+-  ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
+-  if (!io_data->safe_browsing_enabled()->GetValue())
+-    return nullptr;
+-
+-  // |safe_browsing_service_| may be unavailable in tests.
+-  if (safe_browsing_service_ && !safe_browsing_url_checker_delegate_) {
+-    safe_browsing_url_checker_delegate_ =
+-        base::MakeRefCounted<safe_browsing::UrlCheckerDelegateImpl>(
+-            safe_browsing_service_->database_manager(),
+-            safe_browsing_service_->ui_manager());
+-  }
+-
+-  return safe_browsing_url_checker_delegate_.get();
+  return nullptr;
+ }
+ 
+ base::Optional<std::string>
+diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chrome/browser/component_updater/file_type_policies_component_installer.cc
+--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
+@@ -18,7 +18,9 @@
+ #include "base/path_service.h"
+ #include "base/task/post_task.h"
+ #include "base/version.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
+#endif
+ #include "components/component_updater/component_updater_paths.h"
+ 
+ using component_updater::ComponentUpdateService;
+diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
+--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
+@@ -38,8 +38,10 @@
+ #include "chrome/browser/download/save_package_file_picker.h"
+ #include "chrome/browser/platform_util.h"
+ #include "chrome/browser/profiles/profile.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#endif
+ #include "chrome/browser/ui/browser.h"
+ #include "chrome/browser/ui/browser_finder.h"
+ #include "chrome/browser/ui/chrome_pages.h"
+@@ -49,7 +51,9 @@
+ #include "chrome/common/chrome_features.h"
+ #include "chrome/common/pdf_util.h"
+ #include "chrome/common/pref_names.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
+#endif
+ #include "chrome/grit/generated_resources.h"
+ #include "components/download/public/common/download_interrupt_reasons.h"
+ #include "components/download/public/common/download_item.h"
+@@ -94,8 +98,10 @@
+ using content::BrowserThread;
+ using download::DownloadItem;
+ using content::DownloadManager;
+#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::DownloadFileType;
+ using safe_browsing::DownloadProtectionService;
+#endif
+ 
+ namespace {
+ 
+@@ -744,19 +750,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const {
+   return std::string(chrome::kApplicationClientIDStringForAVScanning);
+ }
+ 
+#if defined(FULL_SAFE_BROWSING)
+ DownloadProtectionService*
+     ChromeDownloadManagerDelegate::GetDownloadProtectionService() {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-#if defined(FULL_SAFE_BROWSING)
+   safe_browsing::SafeBrowsingService* sb_service =
+       g_browser_process->safe_browsing_service();
+   if (sb_service && sb_service->download_protection_service() &&
+       profile_->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) {
+     return sb_service->download_protection_service();
+   }
+-#endif
+   return NULL;
+ }
+#endif
+ 
+ void ChromeDownloadManagerDelegate::NotifyExtensions(
+     DownloadItem* download,
+@@ -1199,13 +1205,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
+       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
+ #endif
+ 
+#if defined(FULL_SAFE_BROWSING)
+     DownloadItemModel(item).SetDangerLevel(target_info->danger_level);
+#endif
+   }
+#if defined(FULL_SAFE_BROWSING)
+   if (ShouldBlockFile(target_info->danger_type, item)) {
+     target_info->result = download::DOWNLOAD_INTERRUPT_REASON_FILE_BLOCKED;
+     // A dangerous type would take precendence over the blocking of the file.
+     target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS;
+   }
+#endif
+ 
+   callback.Run(target_info->target_path, target_info->target_disposition,
+                target_info->danger_type, target_info->intermediate_path,
+diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
+--- a/chrome/browser/download/chrome_download_manager_delegate.h
+++ b/chrome/browser/download/chrome_download_manager_delegate.h
+@@ -22,8 +22,10 @@
+ #include "chrome/browser/download/download_path_reservation_tracker.h"
+ #include "chrome/browser/download/download_target_determiner_delegate.h"
+ #include "chrome/browser/download/download_target_info.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
+ #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
+#endif
+ #include "components/download/public/common/download_danger_type.h"
+ #include "components/download/public/common/download_item.h"
+ #include "content/public/browser/download_manager_delegate.h"
+@@ -131,8 +133,10 @@ class ChromeDownloadManagerDelegate
+   DownloadPrefs* download_prefs() { return download_prefs_.get(); }
+ 
+  protected:
+#if defined(FULL_SAFE_BROWSING)
+   virtual safe_browsing::DownloadProtectionService*
+       GetDownloadProtectionService();
+#endif
+ 
+   // Show file picker for |download|.
+   virtual void ShowFilePickerForDownload(
+@@ -197,9 +201,11 @@ class ChromeDownloadManagerDelegate
+                const content::NotificationSource& source,
+                const content::NotificationDetails& details) override;
+ 
+#if defined(FULL_SAFE_BROWSING)
+   // Callback function after the DownloadProtectionService completes.
+   void CheckClientDownloadDone(uint32_t download_id,
+                                safe_browsing::DownloadCheckResult result);
+#endif
+ 
+   // Internal gateways for ShouldCompleteDownload().
+   bool IsDownloadReadyForCompletion(
+diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
+--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
+@@ -22,9 +22,11 @@
+ #include "chrome/browser/download/download_stats.h"
+ #include "chrome/browser/download/offline_item_utils.h"
+ #include "chrome/browser/profiles/profile.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/browser/safe_browsing/download_protection/download_feedback_service.h"
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
+ #include "chrome/common/safe_browsing/file_type_policies.h"
+#endif
+ #include "chrome/grit/chromium_strings.h"
+ #include "chrome/grit/generated_resources.h"
+ #include "components/download/public/common/download_danger_type.h"
+@@ -37,7 +39,9 @@
+ 
+ using base::TimeDelta;
+ using download::DownloadItem;
+#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::DownloadFileType;
+#endif
+ 
+ namespace {
+ 
+@@ -67,9 +71,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
+   // for the file type.
+   bool should_prefer_opening_in_browser_;
+ 
+#if defined(FULL_SAFE_BROWSING)
+   // Danger level of the file determined based on the file type and whether
+   // there was a user action associated with the download.
+   DownloadFileType::DangerLevel danger_level_;
+#endif
+ 
+   // Whether the download is currently being revived.
+   bool is_being_revived_;
+@@ -106,7 +112,9 @@ DownloadItemModelData::DownloadItemModelData()
+     : should_show_in_shelf_(true),
+       was_ui_notified_(false),
+       should_prefer_opening_in_browser_(false),
+#if defined(FULL_SAFE_BROWSING)
+       danger_level_(DownloadFileType::NOT_DANGEROUS),
+#endif
+       is_being_revived_(false) {}
+ 
+ } // namespace
+@@ -368,6 +376,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
+   data->should_prefer_opening_in_browser_ = preference;
+ }
+ 
+#if defined(FULL_SAFE_BROWSING)
+ DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
+   const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
+   return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS;
+@@ -378,6 +387,7 @@ void DownloadItemModel::SetDangerLevel(
+   DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
+   data->danger_level_ = danger_level;
+ }
+#endif
+ 
+ bool DownloadItemModel::IsBeingRevived() const {
+   const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
+diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
+--- a/chrome/browser/download/download_item_model.h
+++ b/chrome/browser/download/download_item_model.h
+@@ -11,7 +11,9 @@
+ #include "base/macros.h"
+ #include "base/strings/string16.h"
+ #include "chrome/browser/download/download_ui_model.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
+#endif
+ #include "components/download/public/common/download_item.h"
+ 
+ // Implementation of DownloadUIModel that wrappers around a |DownloadItem*|. As
+@@ -48,9 +50,11 @@ class DownloadItemModel : public DownloadUIModel,
+   void SetWasUINotified(bool should_notify) override;
+   bool ShouldPreferOpeningInBrowser() const override;
+   void SetShouldPreferOpeningInBrowser(bool preference) override;
+#if defined(FULL_SAFE_BROWSING)
+   safe_browsing::DownloadFileType::DangerLevel GetDangerLevel() const override;
+   void SetDangerLevel(
+       safe_browsing::DownloadFileType::DangerLevel danger_level) override;
+#endif
+   void OpenUsingPlatformHandler() override;
+   bool IsBeingRevived() const override;
+   void SetIsBeingRevived(bool is_being_revived) override;
+diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
+--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
+@@ -33,7 +33,9 @@
+ #include "chrome/common/chrome_features.h"
+ #include "chrome/common/chrome_paths.h"
+ #include "chrome/common/pref_names.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
+#endif
+ #include "components/download/public/common/download_item.h"
+ #include "components/pref_registry/pref_registry_syncable.h"
+ #include "components/prefs/pref_service.h"
+@@ -55,7 +57,9 @@
+ using content::BrowserContext;
+ using content::BrowserThread;
+ using content::DownloadManager;
+#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::FileTypePolicies;
+#endif
+ 
+ namespace {
+ 
+diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
+--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
+@@ -22,7 +22,9 @@
+ #include "chrome/browser/history/history_service_factory.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/common/pref_names.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
+#endif
+ #include "chrome/grit/generated_resources.h"
+ #include "components/download/public/common/download_interrupt_reasons.h"
+ #include "components/history/core/browser/history_service.h"
+@@ -56,13 +58,16 @@
+ 
+ using content::BrowserThread;
+ using download::DownloadItem;
+#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::DownloadFileType;
+#endif
+ 
+ namespace {
+ 
+ const base::FilePath::CharType kCrdownloadSuffix[] =
+     FILE_PATH_LITERAL(".crdownload");
+ 
+#if defined(FULL_SAFE_BROWSING)
+ // Condenses the results from HistoryService::GetVisibleVisitCountToHost() to a
+ // single bool. A host is considered visited before if prior visible visits were
+ // found in history and the first such visit was earlier than the most recent
+@@ -76,6 +81,7 @@ void VisitCountsToVisitedBefore(
+       found_visits && count > 0 &&
+       (first_visit.LocalMidnight() < base::Time::Now().LocalMidnight()));
+ }
+#endif
+ 
+ #if defined(OS_WIN)
+ // Keeps track of whether Adobe Reader is up to date.
+@@ -100,7 +106,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer(
+       create_target_directory_(false),
+       conflict_action_(conflict_action),
+       danger_type_(download->GetDangerType()),
+#if defined(FULL_SAFE_BROWSING)
+       danger_level_(DownloadFileType::NOT_DANGEROUS),
+#endif
+       virtual_path_(initial_virtual_path),
+       is_filetype_handled_safely_(false),
+ #if defined(OS_ANDROID)
+@@ -719,6 +727,7 @@ DownloadTargetDeterminer::Result
+     return CONTINUE;
+   }
+ 
+#if defined(FULL_SAFE_BROWSING)
+   // First determine the danger level assuming that the user doesn't have any
+   // prior visits to the referrer recoreded in history. The resulting danger
+   // level would be ALLOW_ON_USER_GESTURE if the level depends on the visit
+@@ -755,6 +764,7 @@ DownloadTargetDeterminer::Result
+   // invalid, then assume the referrer has not been visited before.
+   if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
+     danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
+#endif
+   return CONTINUE;
+ }
+ 
+@@ -762,11 +772,13 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
+     bool visited_referrer_before) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+   DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
+#if defined(FULL_SAFE_BROWSING)
+   danger_level_ = GetDangerLevel(
+       visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
+   if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
+       danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
+     danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
+#endif
+   DoLoop();
+ }
+ 
+@@ -861,7 +873,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
+             << " Intermediate:" << intermediate_path_.AsUTF8Unsafe()
+             << " Confirmation reason:" << static_cast<int>(confirmation_reason_)
+             << " Danger type:" << danger_type_
+#if defined(FULL_SAFE_BROWSING)
+             << " Danger level:" << danger_level_
+#endif
+             << " Result:" << static_cast<int>(result);
+   std::unique_ptr<DownloadTargetInfo> target_info(new DownloadTargetInfo);
+ 
+@@ -873,7 +887,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
+            ? DownloadItem::TARGET_DISPOSITION_PROMPT
+            : DownloadItem::TARGET_DISPOSITION_OVERWRITE);
+   target_info->danger_type = danger_type_;
+#if defined(FULL_SAFE_BROWSING)
+   target_info->danger_level = danger_level_;
+#endif
+   target_info->intermediate_path = intermediate_path_;
+   target_info->mime_type = mime_type_;
+   target_info->is_filetype_handled_safely = is_filetype_handled_safely_;
+@@ -959,6 +975,7 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const {
+                                 DownloadItem::TARGET_DISPOSITION_PROMPT);
+ }
+ 
+#if defined(FULL_SAFE_BROWSING)
+ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
+     PriorVisitsToReferrer visits) const {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+@@ -990,6 +1007,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
+ 
+   return DownloadFileType::NOT_DANGEROUS;
+ }
+#endif
+ 
+ void DownloadTargetDeterminer::OnDownloadDestroyed(
+     DownloadItem* download) {
+diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h
+--- a/chrome/browser/download/download_target_determiner.h
+++ b/chrome/browser/download/download_target_determiner.h
+@@ -17,7 +17,9 @@
+ #include "chrome/browser/download/download_path_reservation_tracker.h"
+ #include "chrome/browser/download/download_target_determiner_delegate.h"
+ #include "chrome/browser/download/download_target_info.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
+#endif
+ #include "components/download/public/common/download_danger_type.h"
+ #include "components/download/public/common/download_item.h"
+ #include "content/public/browser/download_manager_delegate.h"
+@@ -297,6 +299,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+   // operation.
+   bool HasPromptedForPath() const;
+ 
+#if defined(FULL_SAFE_BROWSING)
+   // Returns true if this download should show the "dangerous file" warning.
+   // Various factors are considered, such as the type of the file, whether a
+   // user action initiated the download, and whether the user has explicitly
+@@ -306,6 +309,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+   // to true if the download requires explicit user consent.
+   safe_browsing::DownloadFileType::DangerLevel GetDangerLevel(
+       PriorVisitsToReferrer visits) const;
+#endif
+ 
+   // download::DownloadItem::Observer
+   void OnDownloadDestroyed(download::DownloadItem* download) override;
+@@ -317,7 +321,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+   bool create_target_directory_;
+   DownloadPathReservationTracker::FilenameConflictAction conflict_action_;
+   download::DownloadDangerType danger_type_;
+#if defined(FULL_SAFE_BROWSING)
+   safe_browsing::DownloadFileType::DangerLevel danger_level_;
+#endif
+   base::FilePath virtual_path_;
+   base::FilePath local_path_;
+   base::FilePath intermediate_path_;
+diff --git a/chrome/browser/download/download_target_info.cc b/chrome/browser/download/download_target_info.cc
+--- a/chrome/browser/download/download_target_info.cc
+++ b/chrome/browser/download/download_target_info.cc
+@@ -4,12 +4,16 @@
+ 
+ #include "chrome/browser/download/download_target_info.h"
+ 
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
+#endif
+ 
+ DownloadTargetInfo::DownloadTargetInfo()
+     : target_disposition(download::DownloadItem::TARGET_DISPOSITION_OVERWRITE),
+       danger_type(download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS),
+#if defined(FULL_SAFE_BROWSING)
+       danger_level(safe_browsing::DownloadFileType::NOT_DANGEROUS),
+#endif
+       is_filetype_handled_safely(false),
+       result(download::DOWNLOAD_INTERRUPT_REASON_NONE) {}
+ 
+diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/download/download_target_info.h
+--- a/chrome/browser/download/download_target_info.h
+++ b/chrome/browser/download/download_target_info.h
+@@ -8,7 +8,9 @@
+ #include <string>
+ 
+ #include "base/files/file_path.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
+#endif
+ #include "components/download/public/common/download_danger_type.h"
+ #include "components/download/public/common/download_interrupt_reasons.h"
+ #include "components/download/public/common/download_item.h"
+@@ -32,6 +34,7 @@ struct DownloadTargetInfo {
+   // Danger type of the download.
+   download::DownloadDangerType danger_type;
+ 
+#if defined(FULL_SAFE_BROWSING)
+   // The danger type of the download could be set to MAYBE_DANGEROUS_CONTENT if
+   // the file type is handled by SafeBrowsing. However, if the SafeBrowsing
+   // service is unable to verify whether the file is safe or not, we are on our
+@@ -57,6 +60,7 @@ struct DownloadTargetInfo {
+   //       SafeBrowsing may flag the file as being malicious, in which case the
+   //       malicious classification should take precedence.
+   safe_browsing::DownloadFileType::DangerLevel danger_level;
+#endif
+ 
+   // Suggested intermediate path. The downloaded bytes should be written to this
+   // path until all the bytes are available and the user has accepted a
+diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc
+--- a/chrome/browser/download/download_ui_model.cc
+++ b/chrome/browser/download/download_ui_model.cc
+@@ -23,7 +23,9 @@
+ 
+ using base::TimeDelta;
+ using download::DownloadItem;
+#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::DownloadFileType;
+#endif
+ using offline_items_collection::FailState;
+ 
+ namespace {
+@@ -368,12 +370,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() const {
+ 
+ void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {}
+ 
+#if defined(FULL_SAFE_BROWSING)
+ DownloadFileType::DangerLevel DownloadUIModel::GetDangerLevel() const {
+   return DownloadFileType::NOT_DANGEROUS;
+ }
+ 
+ void DownloadUIModel::SetDangerLevel(
+     DownloadFileType::DangerLevel danger_level) {}
+#endif
+ 
+ void DownloadUIModel::OpenUsingPlatformHandler() {}
+ 
+diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/download/download_ui_model.h
+--- a/chrome/browser/download/download_ui_model.h
+++ b/chrome/browser/download/download_ui_model.h
+@@ -14,7 +14,9 @@
+ #include "base/strings/string16.h"
+ #include "build/build_config.h"
+ #include "chrome/browser/profiles/profile_manager.h"
+#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
+#endif
+ #include "components/download/public/common/download_item.h"
+ #include "components/offline_items_collection/core/offline_item.h"
+ 
+@@ -172,6 +174,7 @@ class DownloadUIModel {
+   // Change what's returned by ShouldPreferOpeningInBrowser to |preference|.
+   virtual void SetShouldPreferOpeningInBrowser(bool preference);
+ 
+#if defined(FULL_SAFE_BROWSING)
+   // Return the danger level determined during download target determination.
+   // The value returned here is independent of the danger level as determined by
+   // the Safe Browsing.
+@@ -180,6 +183,7 @@ class DownloadUIModel {
+   // Change what's returned by GetDangerLevel().
+   virtual void SetDangerLevel(
+       safe_browsing::DownloadFileType::DangerLevel danger_level);
+#endif
+ 
+   // Open the download using the platform handler for the download. The behavior
+   // of this method will be different from DownloadItem::OpenDownload() if
+diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+@@ -421,14 +421,18 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
+     content::ResourceContext* resource_context,
+     ResourceType resource_type,
+     std::vector<std::unique_ptr<content::ResourceThrottle>>* throttles) {
+#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
+#endif  // defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+ 
+   // Insert either safe browsing or data reduction proxy throttle at the front
+   // of the list, so one of them gets to decide if the resource is safe.
+   content::ResourceThrottle* first_throttle = NULL;
+ #if defined(OS_ANDROID)
+#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+   first_throttle = DataReductionProxyResourceThrottle::MaybeCreate(
+       request, resource_context, resource_type, nullptr);
+#endif
+ #endif  // defined(OS_ANDROID)
+ 
+ #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
+--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
+@@ -78,19 +78,6 @@ namespace {
+ 
+ bool g_access_to_all_files_enabled = false;
+ 
+-// Gets called when the extensions finish work on the URL. If the extensions
+-// did not do a redirect (so |new_url| is empty) then we enforce the
+-// SafeSearch parameters. Otherwise we will get called again after the
+-// redirect and we enforce SafeSearch then.
+-void ForceGoogleSafeSearchCallbackWrapper(net::CompletionOnceCallback callback,
+-                                          net::URLRequest* request,
+-                                          GURL* new_url,
+-                                          int rv) {
+-  if (rv == net::OK && new_url->is_empty())
+-    safe_search_util::ForceGoogleSafeSearch(request->url(), new_url);
+-  std::move(callback).Run(rv);
+-}
+-
+ bool IsAccessAllowedInternal(const base::FilePath& path,
+                              const base::FilePath& profile_path) {
+   if (g_access_to_all_files_enabled)
+@@ -212,26 +199,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
+     GURL* new_url) {
+   extensions_delegate_->ForwardStartRequestStatus(request);
+ 
+-  // The non-redirect case is handled in GoogleURLLoaderThrottle.
+-  bool force_safe_search =
+-      (force_google_safe_search_ && force_google_safe_search_->GetValue() &&
+-       request->is_redirecting());
+-
+-  net::CompletionOnceCallback wrapped_callback = std::move(callback);
+-
+-  if (force_safe_search) {
+-    wrapped_callback = base::BindOnce(
+-        &ForceGoogleSafeSearchCallbackWrapper, std::move(wrapped_callback),
+-        base::Unretained(request), base::Unretained(new_url));
+-  }
+-
+-  int rv = extensions_delegate_->NotifyBeforeURLRequest(
+-      request, std::move(wrapped_callback), new_url);
+-
+-  if (force_safe_search && rv == net::OK && new_url->is_empty())
+-    safe_search_util::ForceGoogleSafeSearch(request->url(), new_url);
+-
+-  return rv;
+  return extensions_delegate_->NotifyBeforeURLRequest(
+      request, std::move(callback), new_url);
+ }
+ 
+ int ChromeNetworkDelegate::OnBeforeStartTransaction(
+-- 
+2.11.0
+
@@ -10,7 +10,7 @@ Subject: Allow playing audio in background
 diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
 --- a/media/blink/webmediaplayer_impl.cc
 +++ b/media/blink/webmediaplayer_impl.cc
-@@ -908,6 +908,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -917,6 +917,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3053,7 +3059,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
+@@ -3108,7 +3114,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
   // If suspending background video, pause any video that's not remoted or
   // not unlocked to play in the background.
   if (IsBackgroundSuspendEnabled(delegate_)) {
@@ -38,7 +38,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
 --- a/media/blink/webmediaplayer_impl.h
 +++ b/media/blink/webmediaplayer_impl.h
-@@ -161,6 +161,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
+@@ -162,6 +162,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   // True if the loaded media has a playable video/audio track.
   bool HasVideo() const override;
   bool HasAudio() const override;
@@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -216,7 +216,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
+@@ -219,7 +219,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
 // Android this includes checking the Android version in the field trial.
 bool ShouldEnableAsyncDns() {
   bool feature_can_be_enabled = true;
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
 --- a/components/cronet/url_request_context_config.cc
 +++ b/components/cronet/url_request_context_config.cc
-@@ -476,7 +476,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+@@ -517,7 +517,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
         effective_experimental_options->Remove(it.key(), nullptr);
         continue;
       }
@@ -43,7 +43,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -320,6 +320,7 @@ void AudioContext::StopRendering() {
+@@ -330,6 +330,7 @@ void AudioContext::StopRendering() {
 double AudioContext::baseLatency() const {
   DCHECK(IsMainThread());
   DCHECK(destination());
@@ -49,13 +49,13 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 -    return;
 -
 -  if (battery_status_.Charging() != old_status.Charging())
-    DispatchEvent(*Event::Create(EventTypeNames::chargingchange));
+-    DispatchEvent(*Event::Create(event_type_names::kChargingchange));
 -  if (battery_status_.charging_time() != old_status.charging_time())
-    DispatchEvent(*Event::Create(EventTypeNames::chargingtimechange));
+-    DispatchEvent(*Event::Create(event_type_names::kChargingtimechange));
 -  if (battery_status_.discharging_time() != old_status.discharging_time())
-    DispatchEvent(*Event::Create(EventTypeNames::dischargingtimechange));
+-    DispatchEvent(*Event::Create(event_type_names::kDischargingtimechange));
 -  if (battery_status_.Level() != old_status.Level())
-    DispatchEvent(*Event::Create(EventTypeNames::levelchange));
+-    DispatchEvent(*Event::Create(event_type_names::kLevelchange));
 }
 
 void BatteryManager::RegisterWithDispatcher() {
@@ -18,12 +18,12 @@ New mechanism for adblocking based on Brave's adblocking hook
 .../browser/appmenu/AppMenuPropertiesDelegate.java |  38 +++
 .../CustomTabAppMenuPropertiesDelegate.java        |   2 +
 .../java/strings/android_chrome_strings.grd        |  11 +
- chrome/browser/net/chrome_network_delegate.cc      |  83 ++++--
+ chrome/browser/net/chrome_network_delegate.cc      |  62 ++++
 .../subresource_filter_content_settings_manager.cc |   1 +
 net/BUILD.gn                                       |   7 +
- net/url_request/adblock_intercept.cc               | 325 +++++++++++++++++++++
- net/url_request/adblock_intercept.h                |  24 ++
- 12 files changed, 510 insertions(+), 20 deletions(-)
+ net/url_request/adblock_intercept.cc               | 341 +++++++++++++++++++++
+ net/url_request/adblock_intercept.h                |  41 +++
+ 12 files changed, 542 insertions(+)
 create mode 100644 net/url_request/adblock_intercept.cc
 create mode 100644 net/url_request/adblock_intercept.h

@@ -73,7 +73,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2205,6 +2205,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2206,6 +2206,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
             RecordUserAction.record("MobileMenuRequestEnableJavascript");
         } else if (id == R.id.reader_mode_prefs_id) {
             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1676,6 +1676,14 @@ public class ChromeTabbedActivity
+@@ -1667,6 +1667,14 @@ public class ChromeTabbedActivity
                 reportNewTabShortcutUsed(true);
                 getTabCreator(true).launchNTP();
             }
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -208,6 +208,8 @@ public class AppMenuPropertiesDelegate {
+@@ -196,6 +196,8 @@ public class AppMenuPropertiesDelegate {
                     && !TextUtils.isEmpty(url);
             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
 
@@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
 
             updateEnableJavascriptMenuItem(menu, currentTab);
-@@ -486,6 +488,42 @@ public class AppMenuPropertiesDelegate {
+@@ -488,6 +490,42 @@ public class AppMenuPropertiesDelegate {
     }
 
     /**
@@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2997,6 +2997,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3055,6 +3055,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
         Turn on Request desktop site
       </message>
@@ -205,7 +205,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/net/chrome_extensions_network_delegate.h"
-@@ -60,6 +61,7 @@
+@@ -59,6 +60,7 @@
 #if defined(OS_ANDROID)
 #include "base/android/path_utils.h"
 #include "chrome/browser/io_thread.h"
@@ -213,7 +213,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 #endif
 
 #if defined(OS_CHROMEOS)
-@@ -207,34 +209,75 @@ void ChromeNetworkDelegate::set_cookie_settings(
+@@ -193,16 +195,76 @@ void ChromeNetworkDelegate::set_cookie_settings(
   cookie_settings_ = cookie_settings;
 }
 
@@ -223,26 +223,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
     net::URLRequest* request,
     net::CompletionOnceCallback callback,
     GURL* new_url) {
-  extensions_delegate_->ForwardStartRequestStatus(request);
-
-  // The non-redirect case is handled in GoogleURLLoaderThrottle.
-  bool force_safe_search =
-      (force_google_safe_search_ && force_google_safe_search_->GetValue() &&
-       request->is_redirecting());
-
-  net::CompletionOnceCallback wrapped_callback = std::move(callback);
-
-  if (force_safe_search) {
-    wrapped_callback = base::BindOnce(
-        &ForceGoogleSafeSearchCallbackWrapper, std::move(wrapped_callback),
-        base::Unretained(request), base::Unretained(new_url));
-  }
- 
-  int rv = extensions_delegate_->NotifyBeforeURLRequest(
-      request, std::move(wrapped_callback), new_url);
-
-  if (force_safe_search && rv == net::OK && new_url->is_empty())
-    safe_search_util::ForceGoogleSafeSearch(request->url(), new_url);
+
 +#if defined(OS_ANDROID)
 +  if (request) {
 +    bool block = false, isValidUrl;
@@ -297,11 +278,11 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 +    } // valid URL and info
 +  } // request
 +#endif // OS_ANDROID
+
+   extensions_delegate_->ForwardStartRequestStatus(request);
 
-  return rv;
-+  extensions_delegate_->ForwardStartRequestStatus(request);
-+  return extensions_delegate_->NotifyBeforeURLRequest(
-+      request, std::move(callback), new_url);
+   return extensions_delegate_->NotifyBeforeURLRequest(
+       request, std::move(callback), new_url);
 }
 
 +#undef TRANSPARENT1PXGIF
@@ -323,7 +304,7 @@ diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settin
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1731,6 +1731,13 @@ component("net") {
+@@ -1758,6 +1758,13 @@ component("net") {
       "url_request/websocket_handshake_userdata_key.h",
     ]
 
@@ -341,7 +322,23 @@ diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_inte
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/adblock_intercept.cc
-@@ -0,0 +1,325 @@
+@@ -0,0 +1,341 @@
+/*
+    This file is part of Bromite.
+
+    Bromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Bromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
+*/
 +#include "url/gurl.h"
 +
 +#ifdef ADB_TESTER
@@ -671,7 +668,24 @@ diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_inter
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/adblock_intercept.h
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,41 @@
+/*
+    This file is part of Bromite.
+
+    Bromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Bromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
 +#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 +#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 +
@@ -30,7 +30,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/public/platform/web_scroll_into_view_params.h"
-@@ -788,7 +786,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+@@ -789,7 +787,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
                              GetState().GetTextAlign(), text);
 
   // scale text metrics by 3/1000000th
@@ -46,7 +46,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.
 
 WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
     WebGLRenderingContextBase* context) {
-  return new WebGLDebugRendererInfo(context);
+-  return MakeGarbageCollected<WebGLDebugRendererInfo>(context);
 +  return nullptr;
 }
 
@@ -59,7 +59,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1432,7 +1432,9 @@ jumbo_component("platform") {
+@@ -1429,7 +1429,9 @@ jumbo_component("platform") {
     "//third_party/blink/renderer:non_test_config",
   ]
 
@@ -108,7 +108,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPaint.h"
-+#include "third_party/skia/src/core/SkColorData.h"
+#include "third_party/skia/include/private/SkColorData.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
@@ -9,7 +9,7 @@ Subject: Disable NTP remote suggestions by default
 diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
-@@ -35,13 +35,13 @@ const base::Feature* const kAllFeatures[] = {
+@@ -34,13 +34,13 @@ const base::Feature* const kAllFeatures[] = {
     &kRemoteSuggestionsBackendFeature};
 
 const base::Feature kArticleSuggestionsFeature{
@@ -24,8 +24,8 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 -                                         base::FEATURE_ENABLED_BY_DEFAULT};
 +                                         base::FEATURE_DISABLED_BY_DEFAULT};
 
- const base::Feature kForeignSessionsSuggestionsFeature{
-     "NTPForeignSessionsSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kBreakingNewsPushFeature{"BreakingNewsPush",
+                                              base::FEATURE_DISABLED_BY_DEFAULT};
 -- 
 2.11.0

@@ -0,0 +1,50 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 23:11:56 +0100
+Subject: Disable Omaha update checks
+
+Do not consider Jelly Bean unsupported
+---
+ .../android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java   | 2 +-
+ .../java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java | 2 +-
+ chrome/browser/android/chrome_feature_list.cc                           | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+@@ -134,7 +134,7 @@ public class OmahaBase {
+ 
+     /** See {@link #sIsDisabled}. */
+     static boolean isDisabled() {
+-        return sIsDisabled;
+        return true;
+     }
+ 
+     /**
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
+@@ -42,7 +42,7 @@ public class VersionNumberGetter {
+     private static VersionNumberGetter sInstanceForTests;
+ 
+     /** If false, OmahaClient will never report that a newer version is available. */
+-    private static boolean sEnableUpdateDetection = true;
+    private static boolean sEnableUpdateDetection = false;
+ 
+     protected VersionNumberGetter() { }
+ 
+diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
+--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
+@@ -351,7 +351,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
+     base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kJellyBeanSupported{"JellyBeanSupported",
+-                                        base::FEATURE_DISABLED_BY_DEFAULT};
+                                        base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kLanguagesPreference{"LanguagesPreference",
+                                          base::FEATURE_ENABLED_BY_DEFAULT};
+-- 
+2.11.0
+
@@ -0,0 +1,23 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Wed, 23 Nov 2016 09:26:51 -0500
+Subject: Disable contextual search by default
+
+---
+ chrome/browser/profiles/profile.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
+--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
+@@ -143,7 +143,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+ #if defined(OS_ANDROID)
+   registry->RegisterStringPref(
+       prefs::kContextualSearchEnabled,
+-      std::string(),
+      "false",
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ #endif  // defined(OS_ANDROID)
+   registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
+-- 
+2.11.0
+
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-@@ -131,6 +131,7 @@ public class DataReductionProxySettings {
+@@ -126,6 +126,7 @@ public class DataReductionProxySettings {
         // DataReductionProxySettings is a singleton that lives forever and there's no clean
         // shutdown of Chrome on Android
         mNativeDataReductionProxySettings = nativeInit();
@@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/D
     }
 
     /** Returns true if the SPDY proxy promo is allowed to be shown. */
-@@ -153,6 +154,7 @@ public class DataReductionProxySettings {
+@@ -148,6 +149,7 @@ public class DataReductionProxySettings {
      * data reduction statistics if this is the first time the SPDY proxy has been enabled.
      */
     public void setDataReductionProxyEnabled(Context context, boolean enabled) {
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureLi
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -232,17 +232,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -239,17 +239,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
 // Variations seed fetching is only enabled in official Chrome builds, if a URL
 // is specified on the command line, and for testing.
 bool IsFetchingEnabled() {
@@ -0,0 +1,23 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sat, 26 Nov 2016 14:57:22 -0500
+Subject: Disable hyperlink auditing by default
+
+---
+ chrome/browser/about_flags.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -1418,7 +1418,7 @@ const FeatureEntry kFeatureEntries[] = {
+      SINGLE_VALUE_TYPE(switches::kDisableIpcFloodingProtection)},
+     {"disable-hyperlink-auditing", flag_descriptions::kHyperlinkAuditingName,
+      flag_descriptions::kHyperlinkAuditingDescription, kOsAll,
+-     SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)},
+     SINGLE_VALUE_TYPE(switches::kNoPings)},
+ #if defined(OS_ANDROID)
+     {"contextual-search", flag_descriptions::kContextualSearchName,
+      flag_descriptions::kContextualSearchDescription, kOsAndroid,
+-- 
+2.11.0
+
@@ -0,0 +1,36 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 25 Apr 2018 10:23:51 +0200
+Subject: Disable metrics on all I/O threads
+
+---
+ chrome/browser/browser_process_impl.cc     | 2 +-
+ chrome/browser/profiles/profile_io_data.cc | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
+--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
+@@ -947,7 +947,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+ #endif  // defined(OS_CHROMEOS)
+ 
+   registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
+-                                GoogleUpdateSettings::GetCollectStatsConsent());
+                                false);
+ 
+ #if defined(OS_ANDROID)
+   registry->RegisterBooleanPref(
+diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
+--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
+@@ -57,8 +57,6 @@
+ #include "components/cookie_config/cookie_store_util.h"
+ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
+ #include "components/dom_distiller/core/url_constants.h"
+-#include "components/metrics/metrics_pref_names.h"
+-#include "components/metrics/metrics_service.h"
+ #include "components/net_log/chrome_net_log.h"
+ #include "components/policy/core/common/cloud/policy_header_service.h"
+ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
+-- 
+2.11.0
+
@@ -1,16 +1,17 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Wed, 11 Oct 2017 23:24:58 +0200
-Subject: Disables omission of URL elements in Omnibox
+Subject: Disable omission of URL elements in Omnibox

-Disable all omissions (already shadowed by first flag)
+Disable all omissions because they are used throughout the code without
+a corresponding user option to individually disable their usage.
 ---
- components/url_formatter/url_formatter.cc | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ components/url_formatter/url_formatter.cc | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)

 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -410,12 +410,12 @@ IDNConversionStatus IDNToUnicodeOneComponent(const base::char16* comp,
+@@ -410,13 +410,13 @@ IDNConversionStatus IDNToUnicodeOneComponent(const base::char16* comp,
 }  // namespace
 
 const FormatUrlType kFormatUrlOmitNothing = 0;
@@ -18,17 +19,19 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
 -const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
 -const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
 -const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
-const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
 -const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
+-const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
+-const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7;
 +const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
 +const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
 +const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
 +const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
-+const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4;
 +const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
- const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
+const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6;
+const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7;
 
 const FormatUrlType kFormatUrlOmitDefaults =
+     kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |
 -- 
 2.11.0

@@ -9,7 +9,7 @@ Subject: Disable plugins enumeration
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1294,10 +1294,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
+@@ -1309,10 +1309,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
 }
 
 PluginData* LocalFrame::GetPluginData() const {
@@ -0,0 +1,28 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 8 Jan 2019 08:54:50 +0100
+Subject: Disable previews by default
+
+---
+ components/previews/core/previews_features.cc | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/components/previews/core/previews_features.cc b/components/previews/core/previews_features.cc
+--- a/components/previews/core/previews_features.cc
+++ b/components/previews/core/previews_features.cc
+@@ -14,12 +14,7 @@ namespace features {
+ // are enabled are controlled by other features.
+ const base::Feature kPreviews {
+   "Previews",
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
+-      // Previews allowed for Android (but also allow on Linux for dev/debug).
+-      base::FEATURE_ENABLED_BY_DEFAULT
+-#else   // !defined(OS_ANDROID) || defined(OS_LINUX)
+-      base::FEATURE_DISABLED_BY_DEFAULT
+-#endif  // defined(OS_ANDROID) || defined(OS_LINUX)
+   base::FEATURE_DISABLED_BY_DEFAULT
+ };
+ 
+ // Enables the Offline previews on android slow connections.
+-- 
+2.11.0
+
@@ -156,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPr
 diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 --- a/chrome/android/java_sources.gni
 +++ b/chrome/android/java_sources.gni
-@@ -140,7 +140,6 @@ chrome_java_sources = [
+@@ -163,7 +163,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java",
@@ -4,10 +4,10 @@ Subject: Disable signin and data saver preferences

 Never show the data saver promo snackbar
 ---
- chrome/android/java/res/xml/main_preferences.xml   |  9 -----
+ chrome/android/java/res/xml/main_preferences.xml   |  9 ------
 .../chromium/chrome/browser/ChromeActivity.java    |  6 ++--
- .../browser/preferences/MainPreferences.java       | 39 +++++++++++-----------
- 3 files changed, 24 insertions(+), 30 deletions(-)
+ .../browser/preferences/MainPreferences.java       | 37 +++++++++++-----------
+ 3 files changed, 22 insertions(+), 30 deletions(-)

 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
@@ -23,22 +23,22 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.preferences.SyncAndServicesPreferences"
         android:key="sync_and_services"
-@@ -85,11 +81,6 @@
-         android:order="15"
+@@ -90,11 +86,6 @@
+         android:order="16"
         android:title="@string/prefs_languages"/>
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
 -        android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences"
 -        android:key="data_reduction"
-        android:order="16"
+-        android:order="17"
 -        android:title="@string/data_reduction_title"/>
 -    <org.chromium.chrome.browser.preferences.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
         android:key="downloads"
-         android:order="17"
+         android:order="18"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -118,7 +118,7 @@ import org.chromium.chrome.browser.printing.TabPrinter;
+@@ -119,7 +119,7 @@ import org.chromium.chrome.browser.printing.TabPrinter;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.share.ShareMenuActionHandler;
 import org.chromium.chrome.browser.snackbar.BottomContainer;
@@ -47,16 +47,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
-@@ -263,7 +263,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -267,7 +267,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+     private EphemeralTabPanel mEphemeralTabPanel;
     protected ReaderModeManager mReaderModeManager;
     private SnackbarManager mSnackbarManager;
-     private ModalDialogManager mModalDialogManager;
 -    private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
 +    //private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
     private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate;
     private AppMenuHandler mAppMenuHandler;
     private ToolbarManager mToolbarManager;
-@@ -666,6 +666,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -678,6 +678,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
         mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelector) {
             @Override
             public void didFirstVisuallyNonEmptyPaint(Tab tab) {
@@ -64,7 +64,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
                 // Only alert about data savings once the first paint has happened. It
                 // doesn't make sense to show a snackbar about savings when nothing has been
                 // displayed yet.
-@@ -679,6 +680,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -691,6 +692,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                             DataReductionProxySettings.getInstance()
                                     .getTotalHttpContentLengthSaved());
                 }
@@ -75,19 +75,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
-@@ -17,9 +17,9 @@ import org.chromium.base.VisibleForTesting;
- import org.chromium.chrome.R;
+@@ -18,10 +18,8 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.contextual_suggestions.ContextualSuggestionsEnabledStateUtils;
 -import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
-+//import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
+ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
 -import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
-+//import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
 import org.chromium.chrome.browser.search_engines.TemplateUrl;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.signin.SigninManager;
-@@ -34,13 +34,11 @@ import java.util.Map;
+@@ -36,13 +34,11 @@ import java.util.Map;
 public class MainPreferences extends PreferenceFragment
         implements SigninManager.SignInStateObserver, TemplateUrlService.LoadListener {
     public static final String PREF_ACCOUNT_SECTION = "account_section";
@@ -101,7 +100,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
     public static final String PREF_NOTIFICATIONS = "notifications";
     public static final String PREF_LANGUAGES = "languages";
     public static final String PREF_DOWNLOADS = "downloads";
-@@ -52,7 +50,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -56,7 +52,6 @@ public class MainPreferences extends PreferenceFragment
 
     private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
     private final Map<String, Preference> mAllPreferences = new HashMap<>();
@@ -109,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
 
     public MainPreferences() {
         setHasOptionsMenu(true);
-@@ -68,25 +65,29 @@ public class MainPreferences extends PreferenceFragment
+@@ -72,25 +67,29 @@ public class MainPreferences extends PreferenceFragment
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -140,7 +139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
     }
 
     @Override
-@@ -99,16 +100,16 @@ public class MainPreferences extends PreferenceFragment
+@@ -103,16 +102,16 @@ public class MainPreferences extends PreferenceFragment
         PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences);
         cachePreferences();
 
@@ -158,9 +157,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
 -        setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
 +        //setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
 
-         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-             // If we are on Android O+ the Notifications preference should lead to the Android
-@@ -164,7 +165,7 @@ public class MainPreferences extends PreferenceFragment
+         updatePasswordsPreference();
+ 
+@@ -180,7 +179,7 @@ public class MainPreferences extends PreferenceFragment
             Preference preference = getPreferenceScreen().getPreference(index);
             mAllPreferences.put(preference.getKey(), preference);
         }
@@ -169,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
     }
 
     private void setManagedPreferenceDelegateForPreference(String key) {
-@@ -173,12 +174,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -189,12 +188,6 @@ public class MainPreferences extends PreferenceFragment
     }
 
     private void updatePreferences() {
@@ -182,7 +181,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
         updateSearchEnginePreference();
 
         if (HomepageManager.shouldShowHomepageSetting()) {
-@@ -201,9 +196,11 @@ public class MainPreferences extends PreferenceFragment
+@@ -217,9 +210,11 @@ public class MainPreferences extends PreferenceFragment
             removePreferenceIfPresent(PREF_CONTEXTUAL_SUGGESTIONS);
         }
 
@@ -194,7 +193,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
     }
 
     private Preference addPreferenceIfAbsent(String key) {
-@@ -254,11 +251,11 @@ public class MainPreferences extends PreferenceFragment
+@@ -279,11 +274,11 @@ public class MainPreferences extends PreferenceFragment
 
     private void onSignInPreferenceStateChanged() {
         // Remove "Account" section header if the personalized sign-in promo is shown.
@@ -209,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
     }
 
     // TemplateUrlService.LoadListener implementation.
-@@ -280,9 +277,11 @@ public class MainPreferences extends PreferenceFragment
+@@ -305,9 +300,11 @@ public class MainPreferences extends PreferenceFragment
                 if (PREF_SAVED_PASSWORDS.equals(preference.getKey())) {
                     return PrefServiceBridge.getInstance().isRememberPasswordsManaged();
                 }
@@ -221,7 +220,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
                 }
-@@ -296,11 +295,13 @@ public class MainPreferences extends PreferenceFragment
+@@ -321,11 +318,13 @@ public class MainPreferences extends PreferenceFragment
                     return prefs.isRememberPasswordsManaged()
                             && !prefs.isRememberPasswordsEnabled();
                 }
@@ -9,7 +9,7 @@ Subject: Disable signin/data reduction promos
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -603,7 +603,7 @@ public class ChromeTabbedActivity
+@@ -604,7 +604,7 @@ public class ChromeTabbedActivity
             // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks
             //                might not have completed at this point and we could show multiple
             //                promos.
@@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
             // Promo dialogs in multiwindow mode are broken on some devices: http://crbug.com/354696
             boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this);
             if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()
-@@ -621,7 +621,7 @@ public class ChromeTabbedActivity
+@@ -622,7 +622,7 @@ public class ChromeTabbedActivity
                         ChromePreferenceManager.PROMOS_SKIPPED_ON_FIRST_START, true);
             }
 
@@ -9,7 +9,7 @@ Subject: Do not grant notifications to default search engine
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -296,7 +296,7 @@ const base::Feature kGeoLanguage{"GeoLanguage",
+@@ -291,7 +291,7 @@ const base::Feature kGeoLanguage{"GeoLanguage",
 
 #if defined(OS_ANDROID)
 const base::Feature kGrantNotificationsToDSE{"GrantNotificationsToDSE",
@@ -17,7 +17,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 +                                             base::FEATURE_DISABLED_BY_DEFAULT};
 #endif  // defined(OS_ANDROID)
 
- #if defined (OS_CHROMEOS)
+ #if defined(OS_CHROMEOS)
 -- 
 2.11.0

@@ -0,0 +1,110 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 20 Jan 2019 06:20:10 +0100
+Subject: Do not ignore download location prompt setting
+
+Upstream has decided that it works as intended (https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
+but users would like to decide where to save a file even when there is no SD card available;
+do not skip the prompt in such cases.
+---
+ .../download/DownloadLocationDialogBridge.java     | 71 +++++++---------------
+ 1 file changed, 21 insertions(+), 50 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
+@@ -32,9 +32,6 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller
+     private PropertyModel mDialogModel;
+     private DownloadLocationCustomView mCustomView;
+     private ModalDialogManager mModalDialogManager;
+-    private long mTotalBytes;
+-    private @DownloadLocationDialogType int mDialogType;
+-    private String mSuggestedPath;
+     private Context mContext;
+ 
+     private DownloadLocationDialogBridge(long nativeDownloadLocationDialogBridge) {
+@@ -67,12 +64,28 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller
+ 
+         mModalDialogManager = activity.getModalDialogManager();
+         mContext = activity;
+-        mTotalBytes = totalBytes;
+-        mDialogType = dialogType;
+-        mSuggestedPath = suggestedPath;
+ 
+-        DownloadDirectoryProvider.getInstance().getAllDirectoriesOptions(
+-                (ArrayList<DirectoryOption> dirs) -> { onDirectoryOptionsRetrieved(dirs); });
+        // Already showing the dialog.
+        if (mDialogModel != null) return;
+
+        // Actually show the dialog.
+        mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate(
+                R.layout.download_location_dialog, null);
+        mCustomView.initialize(dialogType, new File(suggestedPath));
+
+        Resources resources = mContext.getResources();
+        mDialogModel =
+                new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
+                        .with(ModalDialogProperties.CONTROLLER, this)
+                        .with(ModalDialogProperties.TITLE, getTitle(totalBytes, dialogType))
+                        .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView)
+                        .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources,
+                                R.string.duplicate_download_infobar_download_button)
+                        .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources,
+                                R.string.cancel)
+                        .build();
+
+        mModalDialogManager.showDialog(mDialogModel, ModalDialogManager.ModalDialogType.APP);
+     }
+ 
+     @Override
+@@ -105,48 +118,6 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller
+         mCustomView = null;
+     }
+ 
+-    /**
+-     * Called after retrieved the download directory options.
+-     * @param dirs An list of available download directories.
+-     */
+-    private void onDirectoryOptionsRetrieved(ArrayList<DirectoryOption> dirs) {
+-        // If there is only one directory available, don't show the default dialog, and set the
+-        // download directory to default. Dialog will still show for other types of dialogs, like
+-        // name conflict or disk error.
+-        if (dirs.size() == 1 && mDialogType == DownloadLocationDialogType.DEFAULT) {
+-            final DirectoryOption dir = dirs.get(0);
+-            if (dir.type == DirectoryOption.DownloadLocationDirectoryType.DEFAULT) {
+-                assert(!TextUtils.isEmpty(dir.location));
+-                PrefServiceBridge.getInstance().setDownloadAndSaveFileDefaultDirectory(
+-                        dir.location);
+-                nativeOnComplete(mNativeDownloadLocationDialogBridge, mSuggestedPath);
+-            }
+-            return;
+-        }
+-
+-        // Already showing the dialog.
+-        if (mDialogModel != null) return;
+-
+-        // Actually show the dialog.
+-        mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate(
+-                R.layout.download_location_dialog, null);
+-        mCustomView.initialize(mDialogType, new File(mSuggestedPath));
+-
+-        Resources resources = mContext.getResources();
+-        mDialogModel =
+-                new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
+-                        .with(ModalDialogProperties.CONTROLLER, this)
+-                        .with(ModalDialogProperties.TITLE, getTitle(mTotalBytes, mDialogType))
+-                        .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView)
+-                        .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources,
+-                                R.string.duplicate_download_infobar_download_button)
+-                        .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources,
+-                                R.string.cancel)
+-                        .build();
+-
+-        mModalDialogManager.showDialog(mDialogModel, ModalDialogManager.ModalDialogType.APP);
+-    }
+-
+     private String getTitle(long totalBytes, @DownloadLocationDialogType int dialogType) {
+         switch (dialogType) {
+             case DownloadLocationDialogType.LOCATION_FULL:
+-- 
+2.11.0
+
@@ -9,7 +9,7 @@ Subject: Do not store passwords by default
 diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -363,10 +363,10 @@ void RecordParsingOnSavingDifference(
+@@ -321,10 +321,10 @@ void RecordParsingOnSavingDifference(
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -9,7 +9,7 @@ Subject: Enable TLS 1.3 (final) by default
 diff --git a/chrome/browser/ssl/ssl_config_service_manager_pref.cc b/chrome/browser/ssl/ssl_config_service_manager_pref.cc
 --- a/chrome/browser/ssl/ssl_config_service_manager_pref.cc
 +++ b/chrome/browser/ssl/ssl_config_service_manager_pref.cc
-@@ -180,7 +180,7 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
+@@ -179,7 +179,7 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
   } else if (tls13_variant == "draft23") {
     tls13_value = switches::kTLS13VariantDraft23;
     version_value = switches::kSSLVersionTLSv13;
@@ -0,0 +1,25 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Thu, 22 Dec 2016 07:15:34 -0500
+Subject: Enable -fwrapv in Clang for non-UBSan builds
+
+---
+ build/config/compiler/BUILD.gn | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
+@@ -267,6 +267,10 @@ config("compiler") {
+       }
+     }
+ 
+    if (is_clang && !is_ubsan && !is_ubsan_security) {
+      cflags += [ "-fwrapv" ]
+    }
+
+     # Linker warnings.
+     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
+         !(is_android && use_order_profiling) && !is_mac && !is_ios &&
+-- 
+2.11.0
+
@@ -10,7 +10,7 @@ Set #enable-history-entry-requires-user-gesture to enabled by default
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1510,7 +1510,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1420,7 +1420,7 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-history-entry-requires-user-gesture",
      flag_descriptions::kHistoryRequiresUserGestureName,
      flag_descriptions::kHistoryRequiresUserGestureDescription, kOsAll,
@@ -9,9 +9,9 @@ Subject: Fix crash when accessing page info / site settings
 diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
 --- a/chrome/browser/permissions/permission_manager.cc
 +++ b/chrome/browser/permissions/permission_manager.cc
-@@ -677,6 +677,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
-   GURL canonical_requesting_origin =
-       GetCanonicalOrigin(requesting_origin, embedding_origin);
+@@ -689,6 +689,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+   if (status != CONTENT_SETTING_DEFAULT)
+     return PermissionResult(status, PermissionStatusSource::UNSPECIFIED);
   PermissionContextBase* context = GetPermissionContext(permission);
 +  if (context == nullptr) {
 +      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
@@ -0,0 +1,32 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sun, 13 Aug 2017 19:33:04 -0400
+Subject: Hide passwords manager link
+
+---
+ .../chrome/browser/preferences/password/SavePasswordsPreferences.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
+@@ -251,7 +251,7 @@ public class SavePasswordsPreferences
+             return;
+         }
+ 
+-        displayManageAccountLink();
+        //displayManageAccountLink();
+ 
+         PreferenceGroup passwordParent;
+         if (mSearchQuery == null) {
+@@ -326,7 +326,7 @@ public class SavePasswordsPreferences
+             return;
+         }
+ 
+-        displayManageAccountLink();
+        //displayManageAccountLink();
+ 
+         PreferenceCategory profileCategory = new PreferenceCategory(getActivity());
+         profileCategory.setKey(PREF_KEY_CATEGORY_EXCEPTIONS);
+-- 
+2.11.0
+
@@ -9,7 +9,7 @@ Subject: Hide send reports checkbox
 diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
 --- a/chrome/android/java/res/layout/fre_tosanduma.xml
 +++ b/chrome/android/java/res/layout/fre_tosanduma.xml
-@@ -71,7 +71,7 @@
+@@ -70,7 +70,7 @@
                         android:layout_height="wrap_content"
                         android:lineSpacingMultiplier="1.4"
                         android:text="@string/fre_send_report_check"
@@ -3,23 +3,23 @@ Date: Thu, 12 Oct 2017 08:09:24 +0200
 Subject: Modify default preferences

 ---
- chrome/browser/background/background_mode_manager.cc              | 2 +-
- chrome/browser/chrome_content_browser_client.cc                   | 2 +-
- chrome/browser/net/prediction_options.cc                          | 2 +-
- chrome/browser/net/prediction_options.h                           | 2 +-
- chrome/browser/profiles/profile.cc                                | 2 +-
- .../resources/settings/reset_page/reset_profile_dialog.html       | 2 +-
- chrome/browser/signin/signin_promo.cc                             | 4 ++--
- chrome/browser/ui/browser_ui_prefs.cc                             | 4 ++--
- chrome/browser/ui/navigation_correction_tab_observer.cc           | 2 +-
- chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc     | 4 ----
- chrome/service/cloud_print/connector_settings.cc                  | 2 +-
- components/autofill/core/browser/autofill_manager.cc              | 5 +----
- components/autofill/core/common/autofill_prefs.cc                 | 6 +++---
- components/bookmarks/browser/bookmark_utils.cc                    | 4 ++--
- components/safe_browsing/common/safe_browsing_prefs.cc            | 4 ++--
- extensions/common/extension.cc                                    | 8 --------
- 16 files changed, 20 insertions(+), 35 deletions(-)
+ chrome/browser/background/background_mode_manager.cc       |  2 +-
+ chrome/browser/chrome_content_browser_client.cc            |  2 +-
+ chrome/browser/net/prediction_options.cc                   |  2 +-
+ chrome/browser/net/prediction_options.h                    |  2 +-
+ chrome/browser/profiles/profile.cc                         |  2 +-
+ .../settings/reset_page/reset_profile_dialog.html          |  2 +-
+ chrome/browser/signin/signin_promo.cc                      |  4 ++--
+ chrome/browser/ui/browser_ui_prefs.cc                      |  4 ++--
+ chrome/browser/ui/navigation_correction_tab_observer.cc    |  2 +-
+ .../browser/ui/webui/local_discovery/local_discovery_ui.cc |  4 ----
+ chrome/service/cloud_print/connector_settings.cc           |  2 +-
+ components/autofill/core/browser/autofill_manager.cc       | 14 ++++----------
+ components/autofill/core/common/autofill_prefs.cc          |  6 +++---
+ components/bookmarks/browser/bookmark_utils.cc             |  4 ++--
+ components/safe_browsing/common/safe_browsing_prefs.cc     |  4 ++--
+ extensions/common/extension.cc                             |  8 --------
+ 16 files changed, 23 insertions(+), 41 deletions(-)

 diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
 --- a/chrome/browser/background/background_mode_manager.cc
@@ -48,9 +48,9 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
 --- a/chrome/browser/net/prediction_options.cc
 +++ b/chrome/browser/net/prediction_options.cc
-@@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
-         return NetworkPredictionStatus::ENABLED;
+@@ -32,7 +32,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
       }
+       return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK;
     default:
 -      DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
 +      //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
@@ -165,22 +165,45 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -290,10 +290,7 @@ bool AutofillManager::ShouldShowCreditCardSigninPromo(
- bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
-                                        const base::TimeTicks timestamp) {
+@@ -351,10 +351,7 @@ bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
   bool enabled = IsAutofillEnabled();
+   sync_state_ = personal_data_ ? personal_data_->GetSyncSigninState()
+                                : AutofillSyncSigninState::kNumSyncStates;
 -  if (!has_logged_autofill_enabled_) {
-    AutofillMetrics::LogIsAutofillEnabledAtPageLoad(enabled);
+-    AutofillMetrics::LogIsAutofillEnabledAtPageLoad(enabled, sync_state_);
 -    has_logged_autofill_enabled_ = true;
 -  }
 +  has_logged_autofill_enabled_ = true;
 
   return enabled;
 }
+@@ -621,10 +618,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
+       // suggestions available.
+       // TODO(mathp): Differentiate between number of suggestions available
+       // (current metric) and number shown to the user.
+-      if (!has_logged_address_suggestions_count_) {
+-        AutofillMetrics::LogAddressSuggestionsCount(suggestions.size());
+-        has_logged_address_suggestions_count_ = true;
+-      }
+      has_logged_address_suggestions_count_ = true;
+     }
+   }
+ 
+@@ -1216,8 +1210,8 @@ void AutofillManager::Reset() {
+ #if defined(OS_ANDROID) || defined(OS_IOS)
+   autofill_assistant_.Reset();
+ #endif
+-  has_logged_autofill_enabled_ = false;
+-  has_logged_address_suggestions_count_ = false;
+  has_logged_autofill_enabled_ = true;
+  has_logged_address_suggestions_count_ = true;
+   did_show_suggestions_ = false;
+   user_did_type_ = false;
+   user_did_autofill_ = false;
 diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -91,10 +91,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -132,10 +132,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       prefs::kAutofillBillingCustomerNumber, 0.0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
   registry->RegisterBooleanPref(
@@ -193,7 +216,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kAutofillLastVersionDeduped, 0,
-@@ -103,7 +103,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -148,7 +148,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
@@ -223,7 +246,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
 diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -229,9 +229,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -149,9 +149,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -9,7 +9,7 @@ Subject: Offer builtin autocomplete for chrome://flags
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -242,6 +242,8 @@ std::vector<base::string16>
+@@ -235,6 +235,8 @@ std::vector<base::string16>
 ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
   std::vector<base::string16> builtins_to_provide;
   builtins_to_provide.push_back(
@@ -9,7 +9,7 @@ Subject: Open YouTube links in Bromite
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
-@@ -386,6 +386,13 @@ public class ExternalNavigationHandler {
+@@ -403,6 +403,13 @@ public class ExternalNavigationHandler {
             return OverrideUrlLoadingResult.NO_OVERRIDE;
         }
 
@@ -10,7 +10,7 @@ Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromi
 diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
 --- a/chrome/common/chrome_content_client.cc
 +++ b/chrome/common/chrome_content_client.cc
-@@ -538,7 +538,7 @@ void ChromeContentClient::AddContentDecryptionModules(
+@@ -541,7 +541,7 @@ void ChromeContentClient::AddContentDecryptionModules(
     base::FilePath cdm_path;
     content::CdmCapability capability;
     if (IsWidevineAvailable(&cdm_path, &capability)) {
@@ -0,0 +1,118 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 10 Nov 2018 16:09:26 +0100
+Subject: Reduce permissions needed for bookmarks import/export
+
+Completely remove contacts picker permission from the file dialog
+---
+ chrome/android/java/AndroidManifest.xml              |  1 -
+ chrome/browser/android/bookmarks/bookmark_bridge.cc  | 20 +++++++++++++++++---
+ .../src/org/chromium/ui/base/SelectFileDialog.java   | 12 ++++++++----
+ 3 files changed, 25 insertions(+), 8 deletions(-)
+
+diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
+--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
+@@ -35,7 +35,6 @@ by a child template that "extends" this file.
+     {% endif %}
+     <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH"/>
+     <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN"/>
+-    <uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
+     <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
+     <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+ 
+diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc
+--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
+@@ -552,14 +552,23 @@ void BookmarkBridge::ImportBookmarks(JNIEnv* env,
+   select_file_dialog_ = ui::SelectFileDialog::Create(
+     this, std::make_unique<ChromeSelectFilePolicy>(nullptr));
+ 
+-  //NOTE: extension and description are not used on Android
+  //NOTE: extension and description are not used on Android, thus not set
+   ui::SelectFileDialog::FileTypeInfo file_type_info;
+
+#if defined(OS_ANDROID)
+  static const std::vector<base::string16> v_accept_types = { base::UTF8ToUTF16("text/html") };
+
+  // Android needs the original MIME types and an additional capture value.
+  std::pair<std::vector<base::string16>, bool> accept_types =
+      std::make_pair(v_accept_types, /* use_media_capture */ false);
+#else
+   file_type_info.extensions.resize(1);
+   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
+   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("htm"));
+   file_type_info.extension_description_overrides.push_back(base::ASCIIToUTF16("Netscape Bookmark"));
+   file_type_info.allowed_paths =
+-      ui::SelectFileDialog::FileTypeInfo::NATIVE_OR_DRIVE_PATH;
+      ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
+#endif
+ 
+   select_file_dialog_->SelectFile(
+         ui::SelectFileDialog::SELECT_OPEN_FILE,
+@@ -569,7 +578,12 @@ void BookmarkBridge::ImportBookmarks(JNIEnv* env,
+         0,
+         base::FilePath::StringType(),
+         window,
+-        NULL);
+#if defined(OS_ANDROID)
+        &accept_types
+#else
+        NULL
+#endif
+);
+ 
+   //NOTE: this should be called after the actual import
+   Java_BookmarkBridge_bookmarksImported(env, obj);
+diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
+--- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
+++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
+@@ -52,6 +52,7 @@ public class SelectFileDialog
+     private static final String IMAGE_TYPE = "image/";
+     private static final String VIDEO_TYPE = "video/";
+     private static final String AUDIO_TYPE = "audio/";
+    private static final String HTML_TYPE = "text/html";
+     private static final String ALL_IMAGE_TYPES = IMAGE_TYPE + "*";
+     private static final String ALL_VIDEO_TYPES = VIDEO_TYPE + "*";
+     private static final String ALL_AUDIO_TYPES = AUDIO_TYPE + "*";
+@@ -159,7 +160,7 @@ public class SelectFileDialog
+             if (!window.hasPermission(Manifest.permission.READ_CONTACTS)) {
+                 missingPermissions.add(Manifest.permission.READ_CONTACTS);
+             }
+-        } else if (shouldUsePhotoPicker()) {
+        } else if (shouldUsePhotoPicker() || shouldShowHtmlTypes()) {
+             if (!window.hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE)) {
+                 missingPermissions.add(Manifest.permission.READ_EXTERNAL_STORAGE);
+             }
+@@ -324,9 +325,7 @@ public class SelectFileDialog
+      *   3.) There is a valid Android Activity associated with the file request.
+      */
+     private boolean shouldUseContactsPicker() {
+-        if (mFileTypes.size() != 1) return false;
+-        if (!mFileTypes.get(0).equals("text/json+contacts")) return false;
+-        return UiUtils.shouldShowContactsPicker() && mWindowAndroid.getActivity().get() != null;
+       return false;
+     }
+ 
+     /**
+@@ -347,6 +346,7 @@ public class SelectFileDialog
+             }
+             if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
+         }
+        if (mimeTypes.size() == 0) return null;
+         return mimeTypes;
+     }
+ 
+@@ -649,6 +649,10 @@ public class SelectFileDialog
+         return countAcceptTypesFor(specificType) > 0;
+     }
+ 
+    private boolean shouldShowHtmlTypes() {
+        return countAcceptTypesFor(HTML_TYPE) > 0;
+    }
+
+     private boolean shouldShowImageTypes() {
+         return shouldShowTypes(ALL_IMAGE_TYPES, IMAGE_TYPE);
+     }
+-- 
+2.11.0
+
@@ -20,20 +20,111 @@ Subject: Remove Sync and Translate menu
 diff --git a/chrome/android/java/res/drawable-hdpi/settings_translate.png b/chrome/android/java/res/drawable-hdpi/settings_translate.png
 deleted file mode 100644
 index 8067680e81c6ffa1a003c579411173827a3a9f96..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 399
+zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00042Nkl<ZcwWuc
+zJxjwt0LJme7er{c_yr2Oml}2V3s~G9aP6!}z(tU5et?4AT-<~%x+sFhO}e^tsU(Y=
+z0hgddd^pNsLc+Z{l>hP^9KR_C@$!FaVIla45F@WCMg$)o)DW3mQKSdON+{NY%D^rw
+zQ6|u}ti|NX7$R7iF@)z*9c+qa0?AUm<7d7%a4MD+^aKw>u^zc5))3o43mLu<Vh_0s
+z^onI1i*NbG31VmP*$I~u^o9@~3%Mjy{|2j}Ph4OPO<b`i*Ms^ERzc?^JnUm8&>5G;
+z8!SRo0o`C5w_HXQp+hq2?!?{u8c0%8C3Jue>()aulqxVESiz93aydblXyA)AxSXIZ
+z^u+3MIY49igeSZ=wug@XJ`tWQp%m)~(480Xl-fZ9?!ILEyg9Ig+E_v&p@gTlA*4tf
+tij`2N2SrL~qywpbE;5V|EcpMCd%u4DGPZTzo=E@z002ovPDHLkV1m$asKNjM
+
 diff --git a/chrome/android/java/res/drawable-mdpi/settings_translate.png b/chrome/android/java/res/drawable-mdpi/settings_translate.png
 deleted file mode 100644
 index 3b9b4cd482d36a60d4ff0a110b0bcefabe4c1060..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 284
+zcmV+%0ptFOP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002vNkl<ZcwV*C
+zy$-=p90hPI21^H{kVr7~0h$;*gq(zkcms==tbG8pC$M2)sTe$f#Kz1feE^(W(wipt
+z>YqeTIHw=KscAEhFY_CKhZ7#j@Qh~#`t~HT1AWt&iOFYBic(;rl@5Y9UG&&#fH`9r
+zbqhPT0Nhc-8hg~aB!JnVj0zT9La;<0Ijq#SJr@m*036I22Uj!E;6TtuAD4*o-y97Z
+ziWuYbs-FagXn-mvsLH_>O?Hzl1RVtIfGq+yWZ%bGZULC0h?xp|DgiD=uf=xl!2Uvo
+icHkLEh=B&e`~;qlBW{m=6s{@&0000<MNUMnLSTX)y>C|l
+
 diff --git a/chrome/android/java/res/drawable-xhdpi/settings_translate.png b/chrome/android/java/res/drawable-xhdpi/settings_translate.png
 deleted file mode 100644
 index 131a57394ca30dcff4bebcb2471bbbf0e1ac134e..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 547
+zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005%Nkl<ZcwX(-
+zziU%b9ER~X&>vK2=pT?4!CJ8B5V|`lSO?MdsRak2|3E2<Ew~ov3nC6K4yBGdHyIT=
+z*iKQTa&gEaRP2_R<9E1(_FiJ{F<-%<Je=X3K5*}FI12x`^1wNOsFIKphLn;}MY&1<
+zRa%6SwW!7e2_d2+9!QG-C&)S}0;KUkhyudj0~b#<hpahU{YD2gq>+I}uBO%C0%8~2
+zqX2{ZjJTXFC*U;?c-ddi5s!R<4~S{LXX_djTCRX~3-JV7yh7Y2cms!wTkrY83}bwB
+z2dpi`B^D8n3HSqaSVYzpI`{+pWDRAl*>VMX>`+5Y@YI?>wsz=YK)L(kPe6xV>d0E+
+zF#Fw0h$>%W?u)^|9b`@O%&0zU>qXpsF&Oy9RW@l8a&@DCv<Q46cvb|~;{k3U>t;Ei
+z!kb9ohzhbQ9F+l#U_I(XZ6fPFVyg@=tm03vA!hhtr^YXT;4QKq66}a~{=i*iH3)XZ
+zJ#V1R7-E(l!Okq>w0(hXWNl<?1F`K3EFkM3TL*{*PoRnN1<~{aRuPk2Kh<Oqt6sn{
+zQ;3x_<Vp}z9QyzXvi8mZd)X7f1*jwDbN5@1`5@{JK-uDfGz#d(14$IH9}C1i5_>Gi
+l0_C5%UG`c2pI-Xsz;EN&!BMZ3jZy#r002ovPDHLkV1l>+@2da+
+
 diff --git a/chrome/android/java/res/drawable-xxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxhdpi/settings_translate.png
 deleted file mode 100644
 index 55878e697b1afed1b4f039a561dc6212e24fc024..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 793
+zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0008uNkl<ZcwX(=
+z%}Z2a6vy!qU&7QD6$CjgbzuaFrMYX-gy1F-TYN#>*(&T0P^f5;ixxw==!FDzQOmLj
+zW)TU|$~Iz9Aez>~5MeSGNzOdU;V@i=JI&0U$NLB~{9rb}%fp9z&%hk!M$92gIe;pl
+z3Wyj9l9(csBteWw5h(;j9dXi_fJqal&Mqj9DKT-2AY!CT2BnGF10^sPlCTEKJIX71
+z)JmT5wgxg*K&DJUmwnQupf11mfI$K*D&+>^c2@3W<t}H1aS^@Zph5Z5CZJigaScjR
+zMTBa$!Uuig{eHe=HE-q67$$tsm>kf|A8$jyfS$PkZE!?L6P{+3Y9btC#|6l6Q$SJA
+zJsJ|?2*wTQCyfHQr_G#j>iOXcWOyKi8a`n7&M5)i$G8LSaX}DgSmV5K&hghJ$naGk
+zn|yMVCHFr+W;};YV_bu_81R4w*m4VcMRV41&CGcb!S=Xdpk;b9jBZ}iok8`oEP#^s
+zxZ*(HxIwJ~nwTJkA;knuN_trO9#=T%BSV6b(8Ic?TcZbSdt70l>n4JR)6DpO>*nq3
+zafN}FIj#?Cl$~5NU<H)S4chdQct;y?eqjzexj|EYm%9W-*|Z3FLPYa42uQ+JQr19S
+z8PKI*ASGG4OG`vN`5X|W4{pi=YD6F%bO`8HV30TDOK#3CCj|0{M*=#@u3OM^=^OdI
+zpGG0Qa0|L3{jfB{0*bi=tx_fZf;0;Ps$$h0XjBJU8y)O1SD-zjI?&qaU`I*00lm%)
+zv^JT+e&Yso%`?y%9qc|Apbcs~1Fg})u4N;9(71N~84n-S`d?6M*r0iB`k2m2pEmR1
+zf(Er&%x+lJW-v@pl6q-6F+S;(uAXFgph;~W`+^>8I~g9RU77~AeL>qaNZ%d;C_u^s
+zlss&pgcZ=5Jy6WbGCgY#WaDr39a`*x^u>dcIQ=590n!A0HN&vZEG?C{V=ABuDD3<L
+X<=DewY$H`b00000NkvXXu0mjfrJ!K8
+
 diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
 deleted file mode 100644
 index 058b50b84dd216d983e9dea2ea264b39773ac318..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 1038
+zcmV+p1o8WcP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000BkNkl<ZcwX(>
+zK}Zx)90u@NR77ZDqzI8+I%LtIBq1>CB9(`rB#V~#N{sTXQQ#UFR4mj+L_yL)FVdw5
+zWziyt2t7o(5K@$fpoFMU*4D8)xU9Pq43Ec~9k(6b`LAza_%8CfJov%x+j;ZfQFNEb
+z12`KG-~l{<2LKCHgb{}Zy~t>YBMcRaBe4w#ApzaNBoHbkpa(iZdP)TdK_^P66aW<o
+zGC%?<Js=F7FkyN?+%{m2FFR)&5T^%dqyUW`ppydhRRcUgbKdOZfPML2wf+F5xOe~$
+za5X2_a&lcrfC1Ws*OwkpL^d<PXBoFq``hX^=<WnOVSo$r0_HGoWCB?$0G$l*T3*0U
+zRIr6&7Qk=#4L}fCncqTZ7+{YDaF5Y0%Y7~MjxY7x)Mrs=v_5>56u{HU0Q*gCKWkg%
+zzZ!iHpXGBfgAJ^klo-HsmH{^5htXtkfHkMxaUPh*CPp}jjBvX|#jNB2o*};A4dL$x
+zZaR^jWPl1(GQd%H9Vr*E#k6n`zua~vj+y|s+;yl=;Uat{fDf0DatmMzyH{Mi0aNk=
+z7SV+=VZjqPArQ*Yg+(*KsriBvfHVeB1BIss!$v=x(+(m{a9cQ39AFtk*a}5R2a=qY
+zM2G2rH)-YzYX!{XHtL`Vsl}LuIEGp%Af7L*1<;Mkoc-n;k}EEs#5wq==L@R`yh6DE
+zXe@BOIf?tU^9B0=>sf0D9wH09K(eHO_}X@%^EiwcGSJsOT46u}y38pI7<D_Kr9^-i
+zP=vg64xr$P1wcPDKIJ5!8q?%}`J8W;O8jyTpdd(2xC138cbx<%s3v|R?c{)Z)Ej_Z
+zjsbXDFiNzkzJbCM<!8IM&H##xEx>u<B=-&9*y*m*Er37RzyZxh(`*3z`0Eb9fWRFv
+zHG}Q|Gzy#Ng3&CnO?9su03QYHao!$h%_sQ*-2z~Qw<D~%AUhz1jU1q2iT6uT*&Xkc
+z+<->{wR6Q0;bXZ0hXla52{6vu7MTGve7a+uW@Zs&Q??m-0eu3rC-3h{ugD5mMnC|3
+zumC<VKmZvz0Z(nO@k~y@G24JP83D5>w+*PktbBkdCkD`$Cjm}~$_Loa0g=4O2nTGJ
+z4KN`LLB8h&d>4i%6LJCCIpB!UT62U0+GPT0sN#Uwe*rNLsDdUBpr7+<3XGr9!nmqm
+z9zX*J^g=I?UJhtjCjd!2fc<E02gFGMDSAMd6fjK>P)UbW5mEs8p!*B_)Bwsy8PjNj
+zLJc5zn3UxUnxN1F9DJOYCxvN5;D?e6@Sf=Q03N^tcmNOZ5BbKcjE%x^TL1t607*qo
+IM6N<$g2Gw1A^-pY
+
 diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
-index d5ae426f7d7b..a01b1144639c 100644
 --- a/chrome/android/java/res/xml/site_settings_preferences.xml
 +++ b/chrome/android/java/res/xml/site_settings_preferences.xml
@@ -50,9 +50,9 @@
@@ -63,7 +154,6 @@ index d5ae426f7d7b..a01b1144639c 100644
     <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-index 95a1c127a28f..e8b87fcefb3f 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
@@ -39,7 +39,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
@@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2124,15 +2124,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2123,15 +2123,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
 
         final Tab currentTab = getActivityTab();
 
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -1314,7 +1314,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+@@ -1410,7 +1410,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
     public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
         // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
         if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id
@@ -10,7 +10,7 @@ Subject: Remove request for account access permission on reboot
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -943,8 +943,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+@@ -949,8 +949,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
   resources = [
     "java/res_template/xml/file_paths.xml",
     "java/res_template/xml/launchershortcuts.xml",
@@ -19,19 +19,19 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 +    "java/res_template/xml/searchable.xml"
   ]
   res_dir = "java/res_template"
-   variables = chrome_public_jinja_variables
-@@ -955,7 +954,6 @@ jinja_template_resources("chrome_sync_shell_apk_template_resources") {
+   variables = [ "manifest_package=$manifest_package" ]
+@@ -961,7 +960,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
     "java/res_template/xml/file_paths.xml",
     "java/res_template/xml/launchershortcuts.xml",
     "java/res_template/xml/searchable.xml",
 -    "java/res_template/xml/syncadapter.xml",
   ]
   res_dir = "java/res_template"
-   variables = chrome_sync_shell_jinja_variables
+ 
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -830,14 +830,14 @@ by a child template that "extends" this file.
+@@ -884,14 +884,14 @@ by a child template that "extends" this file.
         </provider>
 
         <!-- Sync adapter for browser invalidation. -->
@@ -9,18 +9,18 @@ Subject: Restore classic new tab page
 diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
 --- a/chrome/browser/search/search.cc
 +++ b/chrome/browser/search/search.cc
-@@ -155,10 +155,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
- }
+@@ -156,10 +156,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
 
 bool ShouldShowLocalNewTab(Profile* profile) {
+ #if !defined(OS_ANDROID)
 -  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 -  return command_line->HasSwitch(switches::kForceLocalNtp) ||
 -         (base::FeatureList::IsEnabled(features::kUseGoogleLocalNtp) &&
 -          profile && DefaultSearchProviderIsGoogle(profile));
 +  return true;
+ #endif
+   return false;
 }
- 
- bool ShouldDelayRemoteNTP(const GURL& search_provider_url, Profile* profile) {
 -- 
 2.11.0

@@ -0,0 +1,32 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Wed, 26 Dec 2018 10:20:24 -0500
+Subject: Switch to -fstack-protector-strong
+
+---
+ build/config/compiler/BUILD.gn | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
+@@ -258,16 +258,12 @@ config("compiler") {
+         cflags += [ "-fstack-protector" ]
+       }
+     } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
+-      # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc supports it.
+-      # See also https://crbug.com/533294
+-      cflags += [ "--param=ssp-buffer-size=4" ]
+-
+       # The x86 toolchain currently has problems with stack-protector.
+       if (is_android && current_cpu == "x86") {
+         cflags += [ "-fno-stack-protector" ]
+       } else if (current_os != "aix") {
+         # Not available on aix.
+-        cflags += [ "-fstack-protector" ]
+        cflags += [ "-fstack-protector-strong" ]
+       }
+     }
+ 
+-- 
+2.11.0
+
@@ -0,0 +1,129 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 21 Mar 2018 14:15:28 +0100
+Subject: User Agent: anonymize
+
+Use a fixed device name and Chrome product version with the goal of not
+disclosing the specific build of Bromite.
+---
+ .../browser/ui/android/android_about_app_info.cc   |  4 ++-
+ components/version_info/version_info.cc            | 13 +++++++-
+ content/common/user_agent.cc                       | 37 +++++++++++++++++-----
+ content/public/common/user_agent.h                 |  2 +-
+ 4 files changed, 45 insertions(+), 11 deletions(-)
+
+diff --git a/chrome/browser/ui/android/android_about_app_info.cc b/chrome/browser/ui/android/android_about_app_info.cc
+--- a/chrome/browser/ui/android/android_about_app_info.cc
+++ b/chrome/browser/ui/android/android_about_app_info.cc
+@@ -20,6 +20,8 @@ std::string AndroidAboutAppInfo::GetGmsInfo() {
+ }
+ 
+ std::string AndroidAboutAppInfo::GetOsInfo() {
+  int32_t major_version = 4, minor_version, bugfix_version;
+  base::SysInfo::OperatingSystemVersionNumbers(&major_version, &minor_version, &bugfix_version);
+   return base::SysInfo::OperatingSystemVersion() +
+-         content::GetAndroidOSInfo(/*include_android_build_number=*/true);
+         content::GetAndroidOSInfo(/*include_android_build_number=*/true, major_version);
+ }
+diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
+--- a/components/version_info/version_info.cc
+++ b/components/version_info/version_info.cc
+@@ -7,13 +7,24 @@
+ #include "base/logging.h"
+ #include "base/no_destructor.h"
+ #include "base/version.h"
+#include "base/system/sys_info.h"
+ #include "build/build_config.h"
+ #include "components/version_info/version_info_values.h"
+ 
+ namespace version_info {
+ 
+ std::string GetProductNameAndVersionForUserAgent() {
+-  return "Chrome/" + GetVersionNumber();
+  int32_t major, minor, bugfix;
+  base::SysInfo::OperatingSystemVersionNumbers(&major,
+                                               &minor,
+                                               &bugfix);
+  switch (major) {
+    case 4:
+      return "Chrome/69.0.3497.100";
+  }
+
+  // version 5 and above
+  return "Chrome/71.0.3578.99";
+ }
+ 
+ std::string GetProductName() {
+diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
+--- a/content/common/user_agent.cc
+++ b/content/common/user_agent.cc
+@@ -85,7 +85,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
+   }
+ #elif defined(OS_ANDROID)
+   std::string android_version_str = base::SysInfo::OperatingSystemVersion();
+-  std::string android_info_str = GetAndroidOSInfo(include_android_build_number);
+  std::string android_info_str = GetAndroidOSInfo(include_android_build_number, os_major_version);
+ #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA)
+   // Should work on any Posix system.
+   struct utsname unixinfo;
+@@ -153,18 +153,39 @@ std::string BuildUserAgentFromProductAndExtraOSInfo(
+   return BuildUserAgentFromOSAndProduct(os_info, product);
+ }
+ 
+-std::string GetAndroidOSInfo(bool include_android_build_number) {
+std::string GetAndroidOSInfo(bool include_android_build_number, int32_t os_major_version) {
+   std::string android_info_str;
+ 
+-  // Send information about the device.
+  // Send spoofed information about the device.
+   bool semicolon_inserted = false;
+-  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
+-  std::string android_device_name = base::SysInfo::HardwareModelName();
+-  if (!android_device_name.empty() && "REL" == android_build_codename) {
+-    android_info_str += "; " + android_device_name;
+-    semicolon_inserted = true;
+  std::string android_device_name;
+
+  // Send information about the device and build ID.
+  // Use a common device/build ID based on Android major version.
+  switch (os_major_version) {
+    default: // version 9 and above
+      android_device_name = "ONEPLUS A6000";
+      break;
+    case 8:
+      android_device_name = "FIG-LX3";
+      break;
+    case 7:
+      android_device_name = "SM-G610M";
+      break;
+    case 6:
+      android_device_name = "SM-J700M";
+      break;
+    case 5:
+      android_device_name = "XT1033";
+      break;
+    case 4:
+      android_device_name = "ZTE Blade C370";
+      break;
+   }
+ 
+  android_info_str += "; " + android_device_name;
+  semicolon_inserted = true;
+
+   // Append the build ID.
+   if (base::FeatureList::IsEnabled(kAndroidUserAgentStringContainsBuildId) ||
+       include_android_build_number) {
+diff --git a/content/public/common/user_agent.h b/content/public/common/user_agent.h
+--- a/content/public/common/user_agent.h
+++ b/content/public/common/user_agent.h
+@@ -37,7 +37,7 @@ CONTENT_EXPORT std::string BuildUserAgentFromProductAndExtraOSInfo(
+     bool include_android_build_number);
+ 
+ // Helper function to generate just the OS info.
+-CONTENT_EXPORT std::string GetAndroidOSInfo(bool include_android_build_number);
+CONTENT_EXPORT std::string GetAndroidOSInfo(bool include_android_build_number, int32_t os_major_version);
+ #endif
+ 
+ // Builds a full user agent string given a string describing the OS and a
+-- 
+2.11.0
+
@@ -0,0 +1,112 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 11 Sep 2014 16:37:32 +0200
+Subject: autofill: disable autofill download manager
+
+Disables the autofill download manager (trk:158).
+---
+ .../autofill/core/browser/autofill_download_manager.cc | 13 ++++++++++++-
+ components/autofill/core/browser/autofill_manager.cc   | 18 ------------------
+ 2 files changed, 12 insertions(+), 19 deletions(-)
+
+diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
+--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
+@@ -52,7 +52,6 @@ namespace autofill {
+ 
+ namespace {
+ 
+-const size_t kMaxQueryGetSize = 1400;  // 1.25KB
+ const size_t kAutofillDownloadManagerMaxFormCacheSize = 16;
+ const size_t kMaxFieldsPerQueryRequest = 100;
+ 
+@@ -418,6 +417,7 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload,
+   return upload_request.SerializeToString(payload);
+ }
+ 
+/*
+ // Gets an API method URL given its type (query or upload) and an optional
+ // resource ID.
+ // Example usage:
+@@ -440,6 +440,7 @@ std::string GetAPIMethodUrl(AutofillDownloadManager::RequestType type,
+   }
+   return base::StrCat({api_method_url, "/", resource_id});
+ }
+*/
+ 
+ }  // namespace
+ 
+@@ -565,6 +566,7 @@ void AutofillDownloadManager::ClearUploadHistory(PrefService* pref_service) {
+ 
+ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
+     const FormRequestData& request_data) const {
+#if 0
+   std::string method("POST");
+   std::string query_str;
+ 
+@@ -587,12 +589,17 @@ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
+   GURL url = autofill_server_url_
+                  .Resolve(RequestTypeToString(request_data.request_type))
+                  .ReplaceComponents(replacements);
+#else
+  std::string method("GET");
+  GURL url = GURL("about:blank");
+#endif
+   return std::make_tuple(std::move(url), std::move(method));
+ }
+ 
+ std::tuple<GURL, std::string>
+ AutofillDownloadManager::GetRequestURLAndMethodForApi(
+     const FormRequestData& request_data) const {
+#if 0
+   // ID of the resource to add to the API request URL. Nothing will be added if
+   // |resource_id| is empty.
+   std::string resource_id;
+@@ -621,6 +628,10 @@ AutofillDownloadManager::GetRequestURLAndMethodForApi(
+       (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY)
+           ? "GET"
+           : "POST";
+#else
+  std::string method("GET");
+  GURL url = GURL("about:blank");
+#endif
+   return std::make_tuple(std::move(url), std::move(method));
+ }
+ 
+diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
+--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
+@@ -171,19 +171,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
+   }
+ }
+ 
+-std::string GetAPIKeyForUrl(version_info::Channel channel) {
+-  // First look if we can get API key from command line flag.
+-  const base::CommandLine& command_line =
+-      *base::CommandLine::ForCurrentProcess();
+-  if (command_line.HasSwitch(switches::kAutofillAPIKey))
+-    return command_line.GetSwitchValueASCII(switches::kAutofillAPIKey);
+-
+-  // Get the API key from Chrome baked keys.
+-  if (channel == version_info::Channel::STABLE)
+-    return google_apis::GetAPIKey();
+-  return google_apis::GetNonStableAPIKey();
+-}
+-
+ }  // namespace
+ 
+ AutofillManager::FillingContext::FillingContext() = default;
+@@ -1260,11 +1247,6 @@ AutofillManager::AutofillManager(
+       weak_ptr_factory_(this) {
+   DCHECK(driver);
+   DCHECK(client_);
+-  if (enable_download_manager == ENABLE_AUTOFILL_DOWNLOAD_MANAGER) {
+-    version_info::Channel channel = client_->GetChannel();
+-    download_manager_.reset(
+-        new AutofillDownloadManager(driver, this, GetAPIKeyForUrl(channel)));
+-  }
+   CountryNames::SetLocaleString(app_locale_);
+   if (personal_data_ && client_)
+     personal_data_->OnSyncServiceInitialized(client_->GetSyncService());
+-- 
+2.11.0
+
@@ -11,7 +11,7 @@ anyway), avoid sending to Google.
 diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
 --- a/net/dns/host_resolver_impl.cc
 +++ b/net/dns/host_resolver_impl.cc
-@@ -115,10 +115,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
+@@ -118,10 +118,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
 // cached.
 const int kIPv6ProbePeriodMs = 1000;
 
@@ -23,8 +23,8 @@ diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
 +    { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
 +      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
 
- // We use a separate histogram name for each platform to facilitate the
- // display of error codes by their symbolic name (since each platform has
+ enum DnsResolveStatus {
+   RESOLVE_STATUS_DNS_SUCCESS = 0,
 -- 
 2.11.0

@@ -33,7 +33,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 #include "services/metrics/public/cpp/mojo_ukm_recorder.h"
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
-@@ -725,6 +726,10 @@ Document::Document(const DocumentInit& initializer,
+@@ -722,6 +723,10 @@ Document::Document(const DocumentInit& initializer,
   }
   DCHECK(fetcher_);
 
@@ -44,7 +44,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
   root_scroller_controller_ = RootScrollerController::Create(*this);
 
   // We depend on the url getting immediately set in subframes, but we
-@@ -790,6 +795,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
+@@ -787,6 +792,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
                        Position::BeforeNode(*shadow_host));
 }
 
@@ -62,7 +62,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -427,6 +427,9 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -418,6 +418,9 @@ class CORE_EXPORT Document : public ContainerNode,
     has_xml_declaration_ = has_xml_declaration ? 1 : 0;
   }
 
@@ -72,7 +72,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
   String visibilityState() const;
   mojom::PageVisibilityState GetPageVisibilityState() const;
   bool hidden() const;
-@@ -1780,6 +1783,8 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1776,6 +1779,8 @@ class CORE_EXPORT Document : public ContainerNode,
 
   double start_time_;
 
@@ -84,7 +84,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -1363,6 +1363,15 @@ DOMRectList* Element::getClientRects() {
+@@ -1202,6 +1202,15 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
       quads, *element_layout_object);
@@ -100,7 +100,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
   return DOMRectList::Create(quads);
 }
 
-@@ -1380,6 +1389,13 @@ DOMRect* Element::getBoundingClientRect() {
+@@ -1219,6 +1228,13 @@ DOMRect* Element::getBoundingClientRect() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                         *element_layout_object);
@@ -117,7 +117,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
 --- a/third_party/blink/renderer/core/dom/range.cc
 +++ b/third_party/blink/renderer/core/dom/range.cc
-@@ -1606,11 +1606,27 @@ DOMRectList* Range::getClientRects() const {
+@@ -1646,11 +1646,27 @@ DOMRectList* Range::getClientRects() const {
   Vector<FloatQuad> quads;
   GetBorderAndTextQuads(quads);
 
@@ -149,9 +149,9 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
 diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
-@@ -38,6 +38,24 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
-   return 0;
- }
+@@ -45,6 +45,24 @@ void TextMetrics::Trace(blink::Visitor* visitor) {
+ 
+ TextMetrics::TextMetrics() : baselines_(Baselines::Create()) {}
 
 +void TextMetrics::Shuffle(const double factor) {
 +  // x-direction
@@ -166,9 +166,9 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third
 +  actual_bounding_box_descent_ *= factor;
 +  em_height_ascent_ *= factor;
 +  em_height_descent_ *= factor;
-+  baselines_.setAlphabetic(baselines_.alphabetic() * factor);
-+  baselines_.setHanging(baselines_.hanging() * factor);
-+  baselines_.setIdeographic(baselines_.ideographic() * factor);
+  baselines_->setAlphabetic(baselines_->alphabetic() * factor);
+  baselines_->setHanging(baselines_->hanging() * factor);
+  baselines_->setIdeographic(baselines_->ideographic() * factor);
 +}
 +
 void TextMetrics::Update(const Font& font,
@@ -177,9 +177,9 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third
 diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h
 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
 +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
-@@ -68,6 +68,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
+@@ -71,6 +71,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
 
-   static float GetFontBaseline(const TextBaseline&, const SimpleFontData&);
+   void Trace(blink::Visitor*) override;
 
 +  void Shuffle(const double factor);
 +
@@ -198,7 +198,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/public/platform/web_scroll_into_view_params.h"
-@@ -782,8 +784,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+@@ -783,8 +785,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
   else
     direction = ToTextDirection(GetState().GetDirection(), canvas());
 
@@ -10,24 +10,24 @@ Subject: kill GCM
 .../chrome/browser/ChromeBackgroundService.java    |   1 -
 .../invalidation/InvalidationController.java       |  13 --
 .../browser/ntp/snippets/SnippetsLauncher.java     |  44 -------
- .../browser/services/gcm/GCMBackgroundTask.java    |   2 -
+ .../browser/services/gcm/GCMBackgroundTask.java    |   2 +-
 .../gcm/InvalidationGcmUpstreamSender.java         |  15 ---
 chrome/android/java_sources.gni                    |   2 -
 components/background_task_scheduler/BUILD.gn      |   1 -
 .../BackgroundTaskSchedulerGcmNetworkManager.java  | 146 +--------------------
 components/gcm_driver/android/BUILD.gn             |   1 -
 components/gcm_driver/instance_id/android/BUILD.gn |   1 -
- .../gcm_driver/instance_id/InstanceIDBridge.java   |  31 +----
+ .../gcm_driver/instance_id/InstanceIDBridge.java   |  40 +-----
 components/sync/android/BUILD.gn                   |   1 -
 third_party/cacheinvalidation/BUILD.gn             |   6 -
 .../client/contrib/MultiplexingGcmListener.java    |  92 +------------
 .../android2/channel/AndroidNetworkChannel.java    |  18 +--
- 19 files changed, 14 insertions(+), 523 deletions(-)
+ 19 files changed, 15 insertions(+), 531 deletions(-)

 diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
 --- a/build/secondary/third_party/android_tools/BUILD.gn
 +++ b/build/secondary/third_party/android_tools/BUILD.gn
-@@ -53,9 +53,6 @@ if (enable_java_templates) {
+@@ -83,9 +83,6 @@ if (enable_java_templates) {
     testonly = true
     java_files = [ "//third_party/android_tools/sdk/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
   }
@@ -40,7 +40,7 @@ diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondar
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -308,7 +308,6 @@ android_library("chrome_java") {
+@@ -317,7 +317,6 @@ android_library("chrome_java") {
     "//third_party/android_deps:javax_inject_javax_inject_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_swipe_refresh:android_swipe_refresh_java",
@@ -51,7 +51,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -78,22 +78,17 @@ by a child template that "extends" this file.
+@@ -77,22 +77,17 @@ by a child template that "extends" this file.
     <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
     <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
     <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
 
     <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
-@@ -912,43 +907,6 @@ by a child template that "extends" this file.
+@@ -961,43 +956,6 @@ by a child template that "extends" this file.
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
             android:hardwareAccelerated="false" />
 
@@ -118,7 +118,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
         <!-- Notification service for sync. -->
         <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
             android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
-@@ -960,8 +918,6 @@ by a child template that "extends" this file.
+@@ -1009,8 +967,6 @@ by a child template that "extends" this file.
         </service>
         <service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
             android:exported="false"/>
@@ -127,7 +127,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
         <receiver android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"
             android:exported="false"/>
         <receiver android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"
-@@ -988,24 +944,6 @@ by a child template that "extends" this file.
+@@ -1037,24 +993,6 @@ by a child template that "extends" this file.
             android:exported="false"
             android:permission="android.permission.BIND_JOB_SERVICE"/>
 
@@ -290,7 +290,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
-@@ -106,7 +106,6 @@ public class ChromeBackgroundService extends GcmTaskService {
+@@ -116,7 +116,6 @@ public class ChromeBackgroundService extends GcmTaskService {
 
     @VisibleForTesting
     protected void rescheduleBackgroundSyncTasksOnUpgrade() {
@@ -310,7 +310,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/In
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ContextUtils;
-@@ -198,18 +196,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
+@@ -192,18 +190,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
      * Registers for Google Cloud Messaging (GCM) for Invalidations.
      */
     private void ensureGcmIsInitialized() {
@@ -425,12 +425,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/Sn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
-@@ -39,8 +39,6 @@ public class GCMBackgroundTask implements BackgroundTask {
-             Log.e(TAG, "The received bundle containing message data could not be validated.");
+@@ -41,7 +41,7 @@ public class GCMBackgroundTask implements BackgroundTask {
             return false;
         }
-
-        ChromeGcmListenerService.dispatchMessageToDriver(context, new GCMMessage(extras));
+ 
+-        ChromeGcmListenerService.dispatchMessageToDriver(context, message);
+        //ChromeGcmListenerService.dispatchMessageToDriver(context, message);
         return false;
     }
 
@@ -469,7 +469,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In
 diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 --- a/chrome/android/java_sources.gni
 +++ b/chrome/android/java_sources.gni
-@@ -27,7 +27,6 @@ chrome_java_sources = [
+@@ -28,7 +28,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ChromeActivity.java",
   "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
   "java/src/org/chromium/chrome/browser/ChromeApplication.java",
@@ -477,7 +477,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
   "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
   "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
   "java/src/org/chromium/chrome/browser/ChromeFeatureList.java",
-@@ -1345,7 +1344,6 @@ chrome_java_sources = [
+@@ -1417,7 +1416,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
   "java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
   "java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
@@ -685,7 +685,7 @@ diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/andr
 diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
 --- a/components/gcm_driver/instance_id/android/BUILD.gn
 +++ b/components/gcm_driver/instance_id/android/BUILD.gn
-@@ -26,7 +26,6 @@ android_library("instance_id_driver_java") {
+@@ -27,7 +27,6 @@ android_library("instance_id_driver_java") {
 
   java_files = [
     "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java",
@@ -696,7 +696,7 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm
 diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
 --- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
 +++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
-@@ -32,7 +32,6 @@ public class InstanceIDBridge {
+@@ -26,7 +26,6 @@ public class InstanceIDBridge {
      * Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be
      * initialized on a background thread.
      */
@@ -704,7 +704,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
 
     private static boolean sBlockOnAsyncTasksForTesting;
 
-@@ -108,7 +107,7 @@ public class InstanceIDBridge {
+@@ -71,7 +70,7 @@ public class InstanceIDBridge {
         new BridgeAsyncTask<String>() {
             @Override
             protected String doBackgroundWork() {
@@ -713,7 +713,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
             }
             @Override
             protected void sendResultToNative(String id) {
-@@ -123,7 +122,7 @@ public class InstanceIDBridge {
+@@ -86,7 +85,7 @@ public class InstanceIDBridge {
         new BridgeAsyncTask<Long>() {
             @Override
             protected Long doBackgroundWork() {
@@ -722,12 +722,15 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
             }
             @Override
             protected void sendResultToNative(Long creationTime) {
-@@ -148,12 +147,7 @@ public class InstanceIDBridge {
+@@ -111,15 +110,7 @@ public class InstanceIDBridge {
         new BridgeAsyncTask<String>() {
             @Override
             protected String doBackgroundWork() {
 -                try {
-                    storeLazinessInformation(authorizedEntity, isLazy);
+-                    LazySubscriptionsManager.storeLazinessInformation(
+-                            LazySubscriptionsManager.buildSubscriptionUniqueId(
+-                                    mSubtype, authorizedEntity),
+-                            isLazy);
 -                    return mInstanceID.getToken(authorizedEntity, scope, extras);
 -                } catch (IOException ex) {
 -                    return "";
@@ -736,21 +739,27 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
             }
             @Override
             protected void sendResultToNative(String token) {
-@@ -169,12 +163,7 @@ public class InstanceIDBridge {
+@@ -135,18 +126,7 @@ public class InstanceIDBridge {
         new BridgeAsyncTask<Boolean>() {
             @Override
             protected Boolean doBackgroundWork() {
 -                try {
 -                    mInstanceID.deleteToken(authorizedEntity, scope);
+-                    String subscriptionId = LazySubscriptionsManager.buildSubscriptionUniqueId(
+-                            mSubtype, authorizedEntity);
+-                    if (LazySubscriptionsManager.isSubscriptionLazy(subscriptionId)) {
+-                        LazySubscriptionsManager.deletePersistedMessagesForSubscriptionId(
+-                                subscriptionId);
+-                    }
 -                    return true;
 -                } catch (IOException ex) {
 -                    return false;
 -                }
-+                return true;
+                return false;
             }
             @Override
             protected void sendResultToNative(Boolean success) {
-@@ -189,12 +178,7 @@ public class InstanceIDBridge {
+@@ -161,12 +141,7 @@ public class InstanceIDBridge {
         new BridgeAsyncTask<Boolean>() {
             @Override
             protected Boolean doBackgroundWork() {
@@ -764,7 +773,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
             }
             @Override
             protected void sendResultToNative(Boolean success) {
-@@ -233,11 +217,6 @@ public class InstanceIDBridge {
+@@ -205,11 +180,6 @@ public class InstanceIDBridge {
                 @Override
                 @SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native.
                 protected Result doInBackground() {
@@ -11,7 +11,7 @@ Subject: kill TOS and metrics opt-out
 diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
 --- a/chrome/android/java/res/layout/fre_tosanduma.xml
 +++ b/chrome/android/java/res/layout/fre_tosanduma.xml
-@@ -63,7 +63,8 @@
+@@ -62,7 +62,8 @@
                         android:layout_marginBottom="@dimen/fre_vertical_spacing"
                         android:gravity="center"
                         android:lineSpacingMultiplier="1.4"
@@ -24,8 +24,8 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -181,7 +181,6 @@
-     <dimen name="fre_stacked_button_margin">8dp</dimen>
+@@ -182,7 +182,6 @@
+     <dimen name="fre_button_padding">12dp</dimen>
     <dimen name="fre_margin">24dp</dimen>
     <dimen name="fre_image_height">120dp</dimen>
 -    <dimen name="fre_tos_checkbox_padding">12dp</dimen>
@@ -13,7 +13,7 @@ Barcode, face and text detection APIs
 diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
 --- a/services/shape_detection/BUILD.gn
 +++ b/services/shape_detection/BUILD.gn
-@@ -86,14 +86,10 @@ if (is_android) {
+@@ -85,14 +85,10 @@ if (is_android) {
 
   android_library("shape_detection_java") {
     java_files = [
@@ -0,0 +1,98 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 20 Jan 2018 21:17:27 +0100
+Subject: openH264: enable ARM/ARM64 optimizations
+
+Enable the optimizations not only for ChromeOS but for all compatbile ARM/ARM64 architectures
+Limit threads auto-detect only for iOS
+---
+ content/renderer/media_recorder/h264_encoder.cc |  6 ++---
+ third_party/openh264/BUILD.gn                   | 31 +++++++++++++++++++------
+ 2 files changed, 27 insertions(+), 10 deletions(-)
+
+diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/media_recorder/h264_encoder.cc
+--- a/content/renderer/media_recorder/h264_encoder.cc
+++ b/content/renderer/media_recorder/h264_encoder.cc
+@@ -149,11 +149,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
+     init_params.iRCMode = RC_OFF_MODE;
+   }
+ 
+-#if defined(OS_CHROMEOS)
+-  init_params.iMultipleThreadIdc = 0;
+-#else
+#if defined(OS_MACOSX)
+   // Threading model: Set to 1 due to https://crbug.com/583348.
+   init_params.iMultipleThreadIdc = 1;
+#else
+  init_params.iMultipleThreadIdc = 0;
+ #endif
+ 
+   // TODO(mcasas): consider reducing complexity if there are few CPUs available.
+diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
+--- a/third_party/openh264/BUILD.gn
+++ b/third_party/openh264/BUILD.gn
+@@ -16,11 +16,16 @@ config("config") {
+     # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
+     # devices.
+     defines += [
+-      "HAVE_NEON",
+       "__chromeos__",
+     ]
+   }
+ 
+  if (target_cpu == "arm" || target_cpu == "arm64") {
+    defines += [
+      "HAVE_NEON",
+    ]
+  }
+
+   # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
+   if (!is_win || is_clang) {
+     cflags += [
+@@ -125,8 +130,12 @@ if (use_assembler) {
+ 
+ source_set("common") {
+   sources = openh264_common_sources
+-  if (is_chromeos && target_cpu == "arm") {
+-    sources += openh264_common_sources_asm_arm
+  if (is_chromeos || is_android) {
+    if (target_cpu == "arm") {
+      sources += openh264_common_sources_asm_arm
+    } else if (target_cpu == "arm64") {
+      sources += openh264_common_sources_asm_arm64
+    }
+   }
+   include_dirs = openh264_common_include_dirs
+ 
+@@ -151,8 +160,12 @@ source_set("common") {
+ 
+ source_set("processing") {
+   sources = openh264_processing_sources
+-  if (is_chromeos && target_cpu == "arm") {
+-    sources += openh264_processing_sources_asm_arm
+  if (is_chromeos || is_android) {
+    if (target_cpu == "arm") {
+      sources += openh264_processing_sources_asm_arm
+    } else if (target_cpu == "arm64") {
+      sources += openh264_processing_sources_asm_arm64
+    }
+   }
+   include_dirs = openh264_processing_include_dirs
+ 
+@@ -170,8 +183,12 @@ source_set("processing") {
+ 
+ source_set("encoder") {
+   sources = openh264_encoder_sources
+-  if (is_chromeos && target_cpu == "arm") {
+-    sources += openh264_encoder_sources_asm_arm
+  if (is_chromeos || is_android) {
+    if (target_cpu == "arm") {
+      sources += openh264_encoder_sources_asm_arm
+    } else if (target_cpu == "arm64") {
+      sources += openh264_encoder_sources_asm_arm64
+    }
+   }
+   include_dirs = openh264_encoder_include_dirs
+ 
+-- 
+2.11.0
+
@@ -17,7 +17,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/37
 diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
 +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
-@@ -358,7 +358,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+@@ -359,7 +359,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = GetClientReportUrl(kClientReportPhishingUrl);
   resource_request->method = "POST";
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
   auto loader = network::SimpleURLLoader::Create(std::move(resource_request),
                                                  traffic_annotation);
   loader->AttachStringForUpload(request_data, "application/octet-stream");
-@@ -440,7 +440,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+@@ -441,7 +441,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = GetClientReportUrl(kClientReportMalwareUrl);
   resource_request->method = "POST";
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
 diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
 +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-@@ -1067,7 +1067,7 @@ void CheckClientDownloadRequest::SendRequest() {
+@@ -759,7 +759,7 @@ void CheckClientDownloadRequest::SendRequest() {
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl();
   resource_request->method = "POST";
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_
 diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
-@@ -61,8 +61,7 @@ class SafeBrowsingBlockingPageFactoryImpl
+@@ -59,8 +59,7 @@ class SafeBrowsingBlockingPageFactoryImpl
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
     PrefService* prefs = profile->GetPrefs();
@@ -55,11 +55,11 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrom
 +    bool is_extended_reporting_opt_in_allowed = false;
     bool is_proceed_anyway_disabled =
         prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);
-     unified_consent::UnifiedConsentService* consent_service =
+ 
 diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
-@@ -329,8 +329,10 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
+@@ -359,8 +359,10 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
 
 void SafeBrowsingService::RegisterAllDelayedAnalysis() {
 #if defined(FULL_SAFE_BROWSING)
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
 
 }  // namespace
 
-@@ -289,6 +291,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+@@ -290,6 +292,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
     return;
   }
 
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
   // Fill in metadata about which model we used.
   if (is_extended_reporting) {
     request->set_model_filename(model_loader_extended_->name());
-@@ -371,6 +377,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+@@ -372,6 +378,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
 
   // Record that we made a request
   phishing_report_times_.push(base::Time::Now());
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
 }
 
 void ClientSideDetectionService::StartClientReportMalwareRequest(
-@@ -385,6 +392,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+@@ -386,6 +393,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
     return;
   }
 
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
   std::string request_data;
   if (!request->SerializeToString(&request_data)) {
     UpdateEnumUMAHistogram(REPORT_FAILED_SERIALIZATION);
-@@ -454,6 +465,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+@@ -455,6 +466,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
 
   // Record that we made a malware request
   malware_report_times_.push(base::Time::Now());
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
csagan5	30b0e61732	Release 72.0.3626.73	2019-01-25 07:06:36 +01:00
csagan5	a7c33014b6	Add missing reference to AV1 patch	2019-01-24 20:15:35 +01:00
csagan5	abfa65cd17	Release 72.0.3626.68	2019-01-21 23:29:57 +01:00
csagan5	fedd7572d7	Fix link to GN_ARGS	2019-01-21 12:38:05 +01:00
csagan5	d5dede3dfa	Release 71.0.3578.132	2019-01-18 20:36:34 +01:00
csagan5	a75b452332	Release 71.0.3578.123	2019-01-09 12:05:57 +01:00
csagan5	d22dbd7b38	Add missing revert patch to list	2019-01-06 14:09:50 +01:00
csagan5	79eae0ab09	Release 71.0.3578.120	2019-01-06 13:53:33 +01:00
csagan5	532c9c5c8b	Update safe browsing patch for Android to fix issues found by nikolowry	2019-01-04 16:49:17 +01:00
Nikoandcsagan5	f5278822bb	Update Remove-Sync-and-Translate-menu.patch to a git binary diff Restore index meta to updated Remove-Sync-and-Translate-menu.patch	2019-01-04 11:14:33 +01:00
csagan5	a8d215db86	Patches cleanup for safe_browsing	2019-01-02 19:02:12 +01:00
csagan5	2e921bffd8	Mention AdGuard servers	2019-01-02 11:46:49 +01:00
csagan5	fb225cf638	Release 71.0.3578.115	2019-01-01 13:30:36 +01:00
csagan5	9c88a30ac3	Add link to wiki for SystemWebView instructions	2018-12-29 18:31:26 +01:00
csagan5	0c9047e26d	Release 71.0.3578.110	2018-12-28 00:00:44 +01:00
csagan5	0d37a542ff	Correct safe_browsing flag	2018-12-21 11:02:47 +01:00
csagan5	34b616ba9f	Release 71.0.3578.104	2018-12-21 11:01:16 +01:00
csagan5	2e6d2a5c75	Mention GN_ARGS in README	2018-12-21 10:31:38 +01:00
csagan5	f963a09239	Release 71.0.3578.101	2018-12-18 23:53:07 +01:00
csagan5	fcbca7eb8c	Release 71.0.3578.98	2018-12-16 07:30:03 +01:00
csagan5	65c50e3ec9	Release 71.0.3578.88	2018-12-13 07:22:42 +01:00
csagan5	6cf627f9d4	Release 71.0.3578.85	2018-12-06 11:31:38 +01:00