Release 69.0.3497.113

Release 69.0.3497.109
Updated README
2018-09-30 12:11:13 +02:00 · 2018-09-25 22:12:08 +02:00 · 2018-09-23 09:20:51 +02:00 · 2018-09-23 09:04:17 +02:00 · 2018-09-15 06:45:11 +02:00
96 changed files with 2848 additions and 670 deletions
@@ -6,7 +6,7 @@ about: Create a Bromite bug report

 **Bromite version**

-Version: `v67...`
+Version: `69.0...`
 Arch: `arm` or `arm64` or `x86`
 Android version: ... (example: `lollipop`)

@@ -1,3 +1,15 @@
+# 69.0.3497.113
+* disabled DNS-over-HTTPS (DoH) flag, not working since 69.0.3497.73 (see https://github.com/bromite/bromite/issues/139)
+
+# 69.0.3497.109
+
+# 69.0.3497.102
+* ungoogled-chromium: disable network time tracker
+* ungoogled-chromium: remove third-party/analytics
+* ungoogled-chromium: always use local Devtools instead of remote files
+* build without safebrowsing
+* drop "Hide NTP tiles" flag
+
 # 69.0.3497.91
 * fixed crash when accessing site settings media preferences (fixes https://github.com/bromite/bromite/issues/122)

@@ -8,8 +8,6 @@ Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad bl

 Bromite is only available for Android v4.1 and above.

-See [open issues](https://github.com/bromite/bromite/issues) for the development in progress.
-
 <img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" />

 # Goals
@@ -35,6 +33,8 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
 No.
 This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.

+Additionally, these features would not be privacy-friendly.
+
 ## Does Bromite require root?
 No.

@@ -47,14 +47,16 @@ See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-H

 ## Can you add dark mode/some cool themes?
 No.
-Bromite is about adblocking and privacy.
+Bromite is about privacy and adblocking.

 ## Can you add HTTPS everywhere?
 No.
-We cannot add add-ons to Bromite (merely some features) and anyway HTTPS everywhere in particular is too invasive to be easily maintained across new releases.
+We cannot add add-ons to Bromite (merely some features).

 ## Is Bromite on Play Store?
-No, and this is unlikely to change. The Play Store would not allow total freedom on the adblocking choice, amongst other limitations.
+No, and this is unlikely to change. Many limitations apply for submissions there, including which ads are allowed to be blocked.
+
+Bromite favors user freedom in software choice: the device is yours so you get to choose which software to run on it, end of the story.

 ## Is Bromite on F-Droid?
 It is not on the official F-Droid repository and there are no (more) plans to submit it.
@@ -70,8 +72,9 @@ Yes, since version 69. While the desktop version of Chromium has an option to di
 * remove click-tracking and AMP from search results
 * DNS-over-HTTPS support via Google/CloudFlare servers
 * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
-* chrome flags to hide NTP tiles, disable custom intents and clear session on exit
+* chrome flags to disable custom intents and clear session on exit
 * always-incognito mode
+* completely removed safe browsing and other privacy-unfriendly features
 * 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
 * canvas, audio and other anti-fingerprinting mitigations

@@ -85,14 +88,14 @@ You can inspect all functionality/privacy changes by reading the patches: https:

 # Releases

-All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device.
+All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device (or none otherwise).

 Each tag corresponds to a Chromium Stable release tag.

-Bromite is currently built for ARM, ARM64 and x86 and for the Android SDKs versions 16 and 21
-Additionally, [SystemWebView](https://www.bromite.org/system_web_view) and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.
+Bromite is currently built for ARM, ARM64 and x86 and for the Android SDK versions 16 and 21; [Bromite SystemWebView](https://www.bromite.org/system_web_view) is provided as well (SDK21+).
+For every Bromite build you can always find a matching [vanilla Chromium](https://www.bromite.org/chromium) build which is used for example to verify which issues are specific to Bromite or not.

-The official releases are also available through the [official third-party F-Droid repository](https://www.bromite.org/fdroid).
+All official releases are also available through the [official third-party F-Droid repository](https://www.bromite.org/fdroid).

 ## Integrity and authenticity

@@ -102,7 +105,6 @@ $ sha256sum --check brm_68.0.3440.54.sha256.txt
 arm64_SystemWebView.apk: OK
 arm64_ChromePublic.apk: OK
 arm64_ChromeModernPublic.apk: OK
-arm64_MonochromePublic.apk: OK
 ```

 If you prefer an UI-based tool, you might want to look into [GtkHash](https://github.com/tristanheaven/gtkhash).
@@ -20,5 +20,5 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
 }
 
 -- 
-2.7.4
+2.11.0

@@ -22,5 +22,5 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
 
 bool ShouldDelayRemoteNTP(const GURL& search_provider_url, Profile* profile) {
 -- 
-2.7.4
+2.11.0

@@ -41,5 +41,5 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
   return callback_list_.Add(callback);
 }
 -- 
-2.7.4
+2.11.0

@@ -73,5 +73,5 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 
 void BatteryManager::RegisterWithDispatcher() {
 -- 
-2.7.4
+2.11.0

@@ -40,5 +40,5 @@ diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gc
   // TODO(https://crbug.com/808498): Re-add data use measurement once
   // SimpleURLLoader supports it.
 -- 
-2.7.4
+2.11.0

@@ -60,5 +60,5 @@ diff --git a/components/component_updater/configurator_impl.h b/components/compo
   const int initial_delay_;
 
 -- 
-2.7.4
+2.11.0

@@ -20,5 +20,5 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
            WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
            ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
 -- 
-2.7.4
+2.11.0

@@ -42,5 +42,5 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
 #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
 }  // namespace
 -- 
-2.7.4
+2.11.0

@@ -31,5 +31,5 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
   // Don't show if the profile is an incognito.
   if (profile->IsOffTheRecord())
 -- 
-2.7.4
+2.11.0

@@ -30,5 +30,5 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
 
 const FormatUrlType kFormatUrlOmitDefaults =
 -- 
-2.7.4
+2.11.0

@@ -225,5 +225,5 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
   // show packaged apps and platform apps because there are some pieces of
   // functionality that are only available in chrome://extensions/ but which
 -- 
-2.7.4
+2.11.0

@@ -19,5 +19,5 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 #if defined(OS_ANDROID)
 const base::Feature kAllowAutoplayUnmutedInWebappManifestScope{
 -- 
-2.7.4
+2.11.0

@@ -23,5 +23,5 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
   registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
                                PrefRegistry::NO_REGISTRATION_FLAGS);
 -- 
-2.7.4
+2.11.0

@@ -27,5 +27,5 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 const base::Feature kForeignSessionsSuggestionsFeature{
     "NTPForeignSessionsSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
 -- 
-2.7.4
+2.11.0

@@ -59,5 +59,5 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
 body,
 table,
 -- 
-2.7.4
+2.11.0

@@ -24,5 +24,5 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 
   // Dictionaries to keep track of default tasks in the file browser.
 -- 
-2.7.4
+2.11.0

@@ -51,5 +51,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/dat
 
     /**
 -- 
-2.7.4
+2.11.0

@@ -78,5 +78,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
 
         NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan((view1) -> {
 -- 
-2.7.4
+2.11.0

@@ -244,5 +244,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
                 }
 -- 
-2.7.4
+2.11.0

@@ -28,5 +28,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
             }
 
 -- 
-2.7.4
+2.11.0

@@ -33,7 +33,7 @@ diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/c
 deleted file mode 100644
 index 058b50b84dd216d983e9dea2ea264b39773ac318..0000000000000000000000000000000000000000
 diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
-index 8165826..346cdce 100644
+index 81658269058c..346cdce944c6 100644
 --- a/chrome/android/java/res/xml/site_settings_preferences.xml
 +++ b/chrome/android/java/res/xml/site_settings_preferences.xml
@@ -73,11 +73,11 @@
@@ -51,7 +51,7 @@ index 8165826..346cdce 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 bf12a5c..e3cc3d1 100644
+index bf12a5cab122..e3cc3d118294 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
@@ -89,7 +89,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
@@ -97,5 +97,5 @@ index bf12a5c..e3cc3d1 100644
             if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
                 websitePrefs.add(SiteSettingsCategory.Type.CLIPBOARD);
 -- 
-2.7.4
+2.11.0

@@ -20,5 +20,5 @@ diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/t
 
   progress_callback_ = progress_callback;
 -- 
-2.7.4
+2.11.0

@@ -19,5 +19,5 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
             </LinearLayout>
         </LinearLayout>
 -- 
-2.7.4
+2.11.0

@@ -23,5 +23,5 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
       prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
   const base::TimeDelta time_since_last_download =
 -- 
-2.7.4
+2.11.0

@@ -52,5 +52,5 @@ diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/
 
 AccountInfo SigninManagerBase::GetAuthenticatedAccountInfo() const {
 -- 
-2.7.4
+2.11.0

@@ -52,5 +52,5 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
   SetupMultipart(post_data.get(), compressed_log,
                  upload_done_data.incoming_rtp_dump,
 -- 
-2.7.4
+2.11.0

@@ -132,5 +132,5 @@ diff --git a/rlz/lib/lib_values.h b/rlz/lib/lib_values.h
 extern const int kFinancialPort;
 
 -- 
-2.7.4
+2.11.0

@@ -52,5 +52,5 @@ diff --git a/components/translate/core/browser/translate_script.cc b/components/
     // Append embedded translate.js and a remote element library.
     base::StringPiece str =
 -- 
-2.7.4
+2.11.0

@@ -31,5 +31,5 @@ diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/brows
       net::DefineNetworkTrafficAnnotation("profile_avatar", R"(
         semantics {
 -- 
-2.7.4
+2.11.0

@@ -24,5 +24,5 @@ diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intra
   DCHECK(simple_loaders_.empty() && resulting_origins_.empty());
 
 -- 
-2.7.4
+2.11.0

@@ -355,5 +355,5 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc
 }
 
 -- 
-2.7.4
+2.11.0

@@ -35,5 +35,5 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
   if (checkin_request_.get() || !device_checkin_info_.accounts_set)
     return;
 -- 
-2.7.4
+2.11.0

@@ -117,5 +117,5 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
 
 // static
 -- 
-2.7.4
+2.11.0

@@ -672,5 +672,5 @@ diff --git a/components/domain_reliability/uploader.cc b/components/domain_relia
       UploadResult result;
       result.status = UploadResult::SUCCESS;
 -- 
-2.7.4
+2.11.0

@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 17 Sep 2018 21:50:15 +0200
+Subject: ungoogled-chromium: Disable Network Time Tracker
+
+This connects to Google to check if the system time is correct when a website certificate
+date seems incorrect, according to https://bugs.chromium.org/p/chromium/issues/detail?id=725232
+
+Fixes https://github.com/Eloston/ungoogled-chromium/issues/302
+---
+ components/network_time/network_time_tracker.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/network_time/network_time_tracker.cc b/components/network_time/network_time_tracker.cc
+--- a/components/network_time/network_time_tracker.cc
+++ b/components/network_time/network_time_tracker.cc
+@@ -277,7 +277,7 @@ void NetworkTimeTracker::UpdateNetworkTime(base::Time network_time,
+ }
+ 
+ bool NetworkTimeTracker::AreTimeFetchesEnabled() const {
+-  return base::FeatureList::IsEnabled(kNetworkTimeServiceQuerying);
+  return false;
+ }
+ 
+ NetworkTimeTracker::FetchBehavior NetworkTimeTracker::GetFetchBehavior() const {
+-- 
+2.11.0
+
@@ -0,0 +1,22 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 17 Sep 2018 21:55:33 +0200
+Subject: ungoogled-chromium: Remove third_party/analytics
+
+---
+ ui/webui/resources/webui_resources.grd | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ui/webui/resources/webui_resources.grd b/ui/webui/resources/webui_resources.grd
+--- a/ui/webui/resources/webui_resources.grd
+++ b/ui/webui/resources/webui_resources.grd
+@@ -15,7 +15,6 @@ without changes to the corresponding grd file. -->
+     <includes>
+       <include name="IDR_WEBUI_I18N_TEMPLATE_JS" file="js/i18n_template.js" flattenhtml="true" type="BINDATA" />
+       <include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" flattenhtml="true" type="BINDATA" />
+-      <include name="IDR_WEBUI_ANALYTICS_JS" file="js/analytics.js" flattenhtml="true" type="BINDATA" compress="gzip" />
+       <!-- Roboto Font. Roboto-Regular and Roboto-Light is already available on
+            Android, and Roboto-Medium is not used on Android. All 6 weights of
+            Roboto are available on Chrome OS.-->
+-- 
+2.11.0
+
@@ -0,0 +1,108 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 17 Sep 2018 21:57:19 +0200
+Subject: ungoogled-chromium: Always use local DevTools files instead of remote
+ files from Google
+
+NOTE: This can break Remote Debugging
+This also fixes local debugging with domain substitution
+Related comment: https://bugs.chromium.org/p/chromium/issues/detail?id=710701#c14
+---
+ third_party/blink/renderer/devtools/BUILD.gn                      | 6 ++----
+ third_party/blink/renderer/devtools/front_end/audits2_worker.json | 2 +-
+ third_party/blink/renderer/devtools/front_end/devtools_app.json   | 6 +++---
+ third_party/blink/renderer/devtools/front_end/shell.json          | 4 ++--
+ third_party/blink/renderer/devtools/front_end/worker_app.json     | 2 +-
+ 5 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/third_party/blink/renderer/devtools/BUILD.gn b/third_party/blink/renderer/devtools/BUILD.gn
+--- a/third_party/blink/renderer/devtools/BUILD.gn
+++ b/third_party/blink/renderer/devtools/BUILD.gn
+@@ -1147,10 +1147,8 @@ action("generate_devtools_grd") {
+       devtools_embedder_scripts +
+       [ "$resources_out_dir/devtools_extension_api.js" ]
+ 
+-  # Bundle remote modules in ChromeOS.
+-  if (is_chromeos) {
+-    grd_files += generated_remote_modules + devtools_emulated_devices_images
+-  }
+  # Always bundle remote modules.
+  grd_files += generated_remote_modules + devtools_emulated_devices_images
+ 
+   inputs = grd_files + devtools_image_files
+   outfile = "$root_gen_dir/devtools/devtools_resources.grd"
+diff --git a/third_party/blink/renderer/devtools/front_end/audits2_worker.json b/third_party/blink/renderer/devtools/front_end/audits2_worker.json
+--- a/third_party/blink/renderer/devtools/front_end/audits2_worker.json
+++ b/third_party/blink/renderer/devtools/front_end/audits2_worker.json
+@@ -1,6 +1,6 @@
+ {
+     "modules": [
+         { "name": "worker_service", "type": "autostart" },
+-        { "name": "audits2_worker", "type": "remote" }
+        { "name": "audits2_worker" }
+     ]
+ }
+diff --git a/third_party/blink/renderer/devtools/front_end/devtools_app.json b/third_party/blink/renderer/devtools/front_end/devtools_app.json
+--- a/third_party/blink/renderer/devtools/front_end/devtools_app.json
+++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json
+@@ -5,7 +5,7 @@
+     { "name": "mobile_throttling", "type": "autostart" },
+     { "name": "browser_components", "type": "autostart" },
+ 
+-    { "name": "accessibility", "type": "remote" },
+    { "name": "accessibility" },
+     { "name": "animation" },
+     { "name": "audits2" },
+     { "name": "browser_console" },
+@@ -13,14 +13,14 @@
+     { "name": "cookie_table" },
+     { "name": "devices" },
+     { "name": "elements" },
+-    { "name": "emulated_devices" , "type": "remote" },
+    { "name": "emulated_devices" },
+     { "name": "har_importer" },
+     { "name": "help" },
+     { "name": "layers" },
+     { "name": "layer_viewer" },
+     { "name": "network" },
+     { "name": "performance_monitor" },
+-    { "name": "product_registry_impl", "type": "remote" },
+    { "name": "product_registry_impl" },
+     { "name": "resources" },
+     { "name": "security" },
+     { "name": "timeline" },
+diff --git a/third_party/blink/renderer/devtools/front_end/shell.json b/third_party/blink/renderer/devtools/front_end/shell.json
+--- a/third_party/blink/renderer/devtools/front_end/shell.json
+++ b/third_party/blink/renderer/devtools/front_end/shell.json
+@@ -21,7 +21,7 @@
+ 
+     { "name": "changes" },
+     { "name": "cm" },
+-    { "name": "cm_modes", "type": "remote" },
+    { "name": "cm_modes" },
+     { "name": "color_picker" },
+     { "name": "console" },
+     { "name": "coverage" },
+@@ -41,7 +41,7 @@
+     { "name": "snippets" },
+     { "name": "source_frame" },
+     { "name": "sources" },
+-    { "name": "terminal", "type": "remote" },
+    { "name": "terminal" },
+     { "name": "text_editor" },
+     { "name": "workspace_diff" },
+     { "name": "protocol_monitor"}
+diff --git a/third_party/blink/renderer/devtools/front_end/worker_app.json b/third_party/blink/renderer/devtools/front_end/worker_app.json
+--- a/third_party/blink/renderer/devtools/front_end/worker_app.json
+++ b/third_party/blink/renderer/devtools/front_end/worker_app.json
+@@ -12,7 +12,7 @@
+     { "name": "help" },
+     { "name": "layer_viewer" },
+     { "name": "network" },
+-    { "name": "product_registry_impl", "type": "remote" },
+    { "name": "product_registry_impl" },
+     { "name": "resources" },
+     { "name": "timeline" },
+     { "name": "timeline_model" }
+-- 
+2.11.0
+
@@ -19,5 +19,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase
 
     /**
 -- 
-2.7.4
+2.11.0

@@ -711,5 +711,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
 -- 
-2.7.4
+2.11.0

@@ -710,5 +710,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
 -- 
-2.7.4
+2.11.0

@@ -723,5 +723,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
 -- 
-2.7.4
+2.11.0

@@ -722,5 +722,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
 -- 
-2.7.4
+2.11.0

@@ -20,5 +20,5 @@ diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/p
       render_frame_host, canonical_requesting_origin.GetOrigin(),
       embedding_origin.GetOrigin());
 -- 
-2.7.4
+2.11.0

@@ -105,5 +105,5 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
   configs += [ "//build/config/compiler:no_chromium_code" ]
   configs += [ ":config" ]
 -- 
-2.7.4
+2.11.0

@@ -102,5 +102,5 @@ new file mode 100644
 +
 +#endif  // video_bg_play_h
 -- 
-2.7.4
+2.11.0

@@ -48,5 +48,5 @@ diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl
   void EnabledAudioTracksChanged(
       const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
 -- 
-2.7.4
+2.11.0

@@ -24,5 +24,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
         // security (only access to BROWSABLE activities).
         intent.addCategory(Intent.CATEGORY_BROWSABLE);
 -- 
-2.7.4
+2.11.0

@@ -64,5 +64,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
         Close all tabs
       </message>
 -- 
-2.7.4
+2.11.0

@@ -66,5 +66,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
                 || id == R.id.open_history_menu_id) {
             return true;
 -- 
-2.7.4
+2.11.0

@@ -203,5 +203,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
         Desktop site
       </message>
 -- 
-2.7.4
+2.11.0

@@ -675,5 +675,5 @@ new file mode 100644
 +
 +#endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 -- 
-2.7.4
+2.11.0

@@ -106,5 +106,5 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
       android_info_str.c_str()
 #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
 -- 
-2.7.4
+2.11.0

@@ -52,5 +52,5 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
   // TODO(hongchan): Due to the incompatible constructor between
   // AudioDestinationNode and DefaultAudioDestinationNode, casting directly from
 -- 
-2.7.4
+2.11.0

@@ -250,5 +250,5 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 
   // Methods overridden by all sub-classes
 -- 
-2.7.4
+2.11.0

@@ -1,282 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 28 Apr 2018 08:30:26 +0200
-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.
-
-See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt
---
- chrome/browser/about_flags.cc                      | 12 +++++++++
- chrome/browser/flag_descriptions.cc                |  3 +++
- chrome/browser/flag_descriptions.h                 |  3 +++
- .../browser/net/system_network_context_manager.cc  | 12 +++++----
- .../common/network_features.cc                     |  5 ++--
- .../common/network_features.h                      |  5 ++--
- .../common/network_switch_list.h                   |  4 +++
- net/base/load_flags_list.h                         |  6 +++++
- net/dns/dns_transaction.cc                         | 29 +++-------------------
- net/url_request/url_request_http_job.cc            | 26 +++++++++++--------
- 10 files changed, 61 insertions(+), 44 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
-@@ -421,6 +421,12 @@ const FeatureEntry::Choice kChromeHomeSwipeLogicChoices[] = {
-      switches::kChromeHomeSwipeLogicType, "velocity"},
- };
- 
-+const FeatureEntry::Choice kDnsOverHttpsChoices[] = {
-+    {features::kDnsOverHttpsChoiceDefault, "", ""},
-+    {features::kDnsOverHttpsChoiceGoogle, switches::kDnsOverHttpsServer, "https://dns.google.com/experimental"},
-+    {features::kDnsOverHttpsChoiceCloudflare, switches::kDnsOverHttpsServer, "https://1.1.1.1/dns-query"},
-+};
-+
- #endif  // OS_ANDROID
- 
- const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
-@@ -3517,6 +3523,12 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kAsyncDns)},
- #endif  // defined(OS_ANDROID)
- 
-+#if defined(OS_ANDROID)
-+    {"enable-dns-over-https", flag_descriptions::kDnsOverHttpsName,
-+     flag_descriptions::kDnsOverHttpsDescription, kOsAndroid,
-+     MULTI_VALUE_TYPE(kDnsOverHttpsChoices)},
-+#endif  // defined(OS_ANDROID)
-+
-     {"enable-overflow-icons-for-media-controls",
-      flag_descriptions::kOverflowIconsForMediaControlsName,
-      flag_descriptions::kOverflowIconsForMediaControlsDescription, kOsAll,
-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
-@@ -2112,6 +2112,9 @@ const char kAndroidPaymentAppsDescription[] =
- const char kAsyncDnsName[] = "Async DNS resolver";
- const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
- 
-+const char kDnsOverHttpsName[] = "DNS over HTTPS";
-+const char kDnsOverHttpsDescription[] = "Enables DNS-over-HTTPS (experimental).";
-+
- const char kAutofillAccessoryViewName[] =
-     "Autofill suggestions as keyboard accessory view";
- const char kAutofillAccessoryViewDescription[] =
-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
-@@ -1284,6 +1284,9 @@ extern const char kAppNotificationStatusMessagingDescription[];
- extern const char kAsyncDnsName[];
- extern const char kAsyncDnsDescription[];
- 
-+extern const char kDnsOverHttpsName[];
-+extern const char kDnsOverHttpsDescription[];
-+
- extern const char kAutofillAccessoryViewName[];
- extern const char kAutofillAccessoryViewDescription[];
- 
-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
-@@ -23,6 +23,7 @@
- #include "chrome/common/chrome_features.h"
- #include "chrome/common/pref_names.h"
- #include "components/network_session_configurator/common/network_features.h"
-+#include "components/network_session_configurator/common/network_switches.h"
- #include "components/policy/core/common/policy_namespace.h"
- #include "components/policy/core/common/policy_service.h"
- #include "components/policy/policy_constants.h"
-@@ -370,11 +371,12 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
-       std::make_unique<base::ListValue>();
-   std::unique_ptr<base::ListValue> default_doh_server_methods =
-       std::make_unique<base::ListValue>();
-  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
-    base::Value server(variations::GetVariationParamValueByFeature(
-        features::kDnsOverHttps, "server"));
-    base::Value method(variations::GetVariationParamValueByFeature(
-        features::kDnsOverHttps, "method"));
-+  std::string dnsOverHttpsServer =
-+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-+      switches::kDnsOverHttpsServer);
-+  if (!dnsOverHttpsServer.empty()) {
-+    base::Value server(dnsOverHttpsServer);
-+    base::Value method("POST");
-     if (!server.GetString().empty()) {
-       default_doh_servers->GetList().push_back(std::move(server));
-       default_doh_server_methods->GetList().push_back(std::move(method));
-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
-@@ -14,7 +14,8 @@ const base::Feature kTokenBinding{"token-binding",
- // TODO(nharper): Disable kChannelID on all platforms in M69.
- const base::Feature kChannelID{"channel-id", base::FEATURE_ENABLED_BY_DEFAULT};
- 
-const base::Feature kDnsOverHttps{"dns-over-https",
-                                  base::FEATURE_DISABLED_BY_DEFAULT};
-+const char kDnsOverHttpsChoiceDefault[] = "Disabled",
-+                 kDnsOverHttpsChoiceGoogle[] = "Google",
-+                 kDnsOverHttpsChoiceCloudflare[] = "Cloudflare";
- 
- }  // 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
-@@ -17,9 +17,10 @@ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
- // Enables Channel ID.
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
- 
-// Enabled DNS over HTTPS
-+// DNS over HTTPS server endpoint choices
- // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
-NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
-+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kDnsOverHttpsChoiceDefault[],
-+   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[];
- 
- }  // namespace features
- 
-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
-@@ -35,6 +35,10 @@ NETWORK_SWITCH(kOriginToForceQuicOn, "origin-to-force-quic-on")
- // the server.
- NETWORK_SWITCH(kQuicConnectionOptions, "quic-connection-options")
- 
-+// Specifies an IETF DNS-over-HTTPS server endpoint
-+// (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
-+NETWORK_SWITCH(kDnsOverHttpsServer, "dns-over-https-server")
-+
- // Specifies the maximum length for a QUIC packet.
- NETWORK_SWITCH(kQuicMaxPacketLength, "quic-max-packet-length")
- 
-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)
- 
- // Indicates that this request is not to be migrated to a cellular network when
-+
-+// This load will not send Accept-Language or User-Agent headers, and not
-+// advertise brotli encoding.
-+// Used to comply with IETF (draft) DNS-over-HTTPS:
-+// "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)
- 
-diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
--- a/net/dns/dns_transaction.cc
-+++ b/net/dns/dns_transaction.cc
-@@ -389,30 +389,8 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
- 
-     HttpRequestHeaders extra_request_headers;
-     extra_request_headers.SetHeader("Accept", kDnsOverHttpResponseContentType);
-
-    request_ = url_request_context->CreateRequest(
-        url, request_priority_, this,
-        net::DefineNetworkTrafficAnnotation("dns_over_https", R"(
-        semantics {
-          sender: "DNS over HTTPS"
-          description: "Domain name resolution over HTTPS"
-          trigger: "User enters a navigates to a domain or Chrome otherwise "
-                   "makes a connection to a domain whose IP address isn't cached"
-          data: "The domain name that is being requested"
-          destination: OTHER
-          destination_other: "The user configured DNS over HTTPS server, which"
-                             "may be dns.google.com"
-        }
-        policy {
-          cookies_allowed: NO
-          setting:
-            "You can configure this feature via that 'dns_over_https_servers' and"
-            "'dns_over_https.method' prefs. Empty lists imply this feature is"
-            "disabled"
-          policy_exception_justification: "Experimental feature that"
-                                          "is disabled by default"
-        }
-      )"));
-+    //extra_request_headers.SetHeader(HttpRequestHeaders::kUserAgent, "DoH client");
-+    request_ = url_request_context->CreateRequest(url, request_priority_, this);
-     net_log_ = request_->net_log();
- 
-     if (use_post) {
-@@ -430,6 +408,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
-     request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
-                            LOAD_BYPASS_PROXY | LOAD_DO_NOT_SEND_COOKIES |
-                            LOAD_DO_NOT_SAVE_COOKIES |
-+                           LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
-                            LOAD_DO_NOT_SEND_AUTH_DATA);
-   }
- 
-@@ -849,7 +828,7 @@ class DnsTransactionImpl : public DnsTransaction,
-         had_tcp_attempt_(false),
-         doh_attempt_(false),
-         first_server_index_(0),
-        request_priority_(DEFAULT_PRIORITY) {
-+        request_priority_(MAXIMUM_PRIORITY) {
-     DCHECK(session_.get());
-     DCHECK(!hostname_.empty());
-     DCHECK(!callback_.is_null());
-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,21 +434,25 @@ void URLRequestHttpJob::Start() {
-   // plugin could set a referrer although sending the referrer is inhibited.
-   request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
- 
-  // Our consumer should have made sure that this is a safe referrer. See for
-  // instance WebCore::FrameLoader::HideReferrer.
-  if (referrer.is_valid()) {
-    request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
-+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
-+    // Our consumer should have made sure that this is a safe referrer. See for
-+    // instance WebCore::FrameLoader::HideReferrer.
-+    if (referrer.is_valid()) {
-+      request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
-                                           referrer.spec());
-+    }
-   }
- 
-   request_info_.token_binding_referrer = request_->token_binding_referrer();
- 
-   // This should be kept in sync with the corresponding code in
-   // URLRequest::GetUserAgent.
-  request_info_.extra_headers.SetHeaderIfMissing(
-+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
-+    request_info_.extra_headers.SetHeaderIfMissing(
-       HttpRequestHeaders::kUserAgent,
-       http_user_agent_settings_ ?
-           http_user_agent_settings_->GetUserAgent() : std::string());
-+  }
- 
-   AddExtraHeaders();
-   AddCookieHeaderAndStart();
-@@ -666,10 +670,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
-           HttpRequestHeaders::kAcceptEncoding)) {
-     // Advertise "br" encoding only if transferred data is opaque to proxy.
-     bool advertise_brotli = false;
-    if (request()->context()->enable_brotli()) {
-      if (request()->url().SchemeIsCryptographic() ||
-          IsLocalhost(request()->url())) {
-        advertise_brotli = true;
-+    if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
-+      if (request()->context()->enable_brotli()) {
-+        if (request()->url().SchemeIsCryptographic() ||
-+            IsLocalhost(request()->url())) {
-+          advertise_brotli = true;
-+        }
-       }
-     }
- 
-@@ -686,7 +692,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
-                                           advertised_encodings);
-   }
- 
-  if (http_user_agent_settings_) {
-+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS) && http_user_agent_settings_) {
-     // Only add default Accept-Language if the request didn't have it
-     // specified.
-     std::string accept_language =
-- 
-2.7.4
-
@@ -171,5 +171,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
 
 void CanvasRenderingContext2D::DrawTextInternal(
 -- 
-2.7.4
+2.11.0

@@ -20,5 +20,5 @@ diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_conte
 
       cdms->push_back(
 -- 
-2.7.4
+2.11.0

@@ -19,5 +19,5 @@ diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profile
 
 chrome_browser_net::Predictor* ProfileIOData::GetPredictor() {
 -- 
-2.7.4
+2.11.0

@@ -1,116 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 9 Jul 2018 20:12:19 +0200
-Subject: Add flag to show/hide NTP tiles
-
---
- chrome/browser/about_flags.cc                           | 4 ++++
- chrome/browser/android/ntp/most_visited_sites_bridge.cc | 8 ++++++++
- chrome/browser/flag_descriptions.cc                     | 4 ++++
- chrome/browser/flag_descriptions.h                      | 3 +++
- chrome/common/chrome_switches.cc                        | 3 +++
- chrome/common/chrome_switches.h                         | 1 +
- 6 files changed, 23 insertions(+)
-
-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
-@@ -1902,6 +1902,10 @@ const FeatureEntry kFeatureEntries[] = {
-      SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)},
- #endif  // OS_MACOSX
- #if defined(OS_ANDROID)
-+    {"hide-ntp-tiles",
-+     flag_descriptions::kHideNTPTilesName,
-+     flag_descriptions::kHideNTPTilesDescription, kOsAndroid,
-+     SINGLE_VALUE_TYPE(switches::kHideNTPTiles)},
-     {"disable-pull-to-refresh-effect",
-      flag_descriptions::kPullToRefreshEffectName,
-      flag_descriptions::kPullToRefreshEffectDescription, kOsAndroid,
-diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
--- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc
-+++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
-@@ -13,9 +13,11 @@
- #include "base/android/jni_array.h"
- #include "base/android/jni_string.h"
- #include "base/android/scoped_java_ref.h"
-+#include "base/command_line.h"
- #include "base/strings/string16.h"
- #include "base/strings/utf_string_conversions.h"
- #include "chrome/browser/browser_process.h"
-+#include "chrome/common/chrome_switches.h"
- #include "chrome/browser/history/history_service_factory.h"
- #include "chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.h"
- #include "chrome/browser/profiles/profile.h"
-@@ -162,6 +164,10 @@ void MostVisitedSitesBridge::JavaObserver::OnURLsAvailable(
-   std::vector<int> sources;
-   std::vector<int> section_types;
-   std::vector<int64_t> data_generation_times;
-+
-+  // do not source any tile if NTP is disabled
-+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+      switches::kHideNTPTiles)) {
-   for (const auto& section : sections) {
-     const NTPTilesVector& tiles = section.second;
-     section_types.resize(section_types.size() + tiles.size(),
-@@ -176,6 +182,8 @@ void MostVisitedSitesBridge::JavaObserver::OnURLsAvailable(
-           tile.data_generation_time.ToJavaTime());
-     }
-   }
-+  }
-+
-   Java_MostVisitedSitesBridge_onURLsAvailable(
-       env, observer_, ToJavaArrayOfStrings(env, titles),
-       ToJavaArrayOfStrings(env, urls), ToJavaIntArray(env, section_types),
-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
-@@ -141,6 +141,10 @@ const char kBackgroundVideoTrackOptimizationDescription[] =
-     "Disable video tracks when the video is played in the background to "
-     "optimize performance.";
- 
-+const char kHideNTPTilesName[] = "Hide NTP tiles";
-+const char kHideNTPTilesDescription[] =
-+    "Hide all tiles on the New Tab Page, making it effectively empty all the time.";
-+
- const char kBleAdvertisingInExtensionsName[] = "BLE Advertising in Chrome Apps";
- const char kBleAdvertisingInExtensionsDescription[] =
-     "Enables BLE Advertising in Chrome Apps. BLE Advertising might interfere "
-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
-@@ -113,6 +113,9 @@ extern const char kAv1DecoderDescription[];
- extern const char kBackgroundVideoTrackOptimizationName[];
- extern const char kBackgroundVideoTrackOptimizationDescription[];
- 
-+extern const char kHideNTPTilesName[];
-+extern const char kHideNTPTilesDescription[];
-+
- extern const char kBleAdvertisingInExtensionsName[];
- extern const char kBleAdvertisingInExtensionsDescription[];
- 
-diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
--- a/chrome/common/chrome_switches.cc
-+++ b/chrome/common/chrome_switches.cc
-@@ -88,6 +88,9 @@ const char kAutoSelectDesktopCaptureSource[] =
- const char kBypassAppBannerEngagementChecks[] =
-     "bypass-app-banner-engagement-checks";
- 
-+// Hide all New Tab Page tiles, making it effectively empty all the time.
-+const char kHideNTPTiles[] = "hide-ntp-tiles";
-+
- // How often (in seconds) to check for updates. Should only be used for testing
- // purposes.
- const char kCheckForUpdateIntervalSec[]     = "check-for-update-interval";
-diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
--- a/chrome/common/chrome_switches.h
-+++ b/chrome/common/chrome_switches.h
-@@ -46,6 +46,7 @@ extern const char kAuthServerWhitelist[];
- extern const char kAutoOpenDevToolsForTabs[];
- extern const char kAutoSelectDesktopCaptureSource[];
- extern const char kBypassAppBannerEngagementChecks[];
-+extern const char kHideNTPTiles[];
- extern const char kCheckForUpdateIntervalSec[];
- extern const char kCipherSuiteBlacklist[];
- extern const char kCloudPrintFile[];
-- 
-2.7.4
-
@@ -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
-@@ -180,7 +180,7 @@ void OnAuthPrefsChanged(const std::string& pref_name) {
+@@ -179,7 +179,7 @@ void OnAuthPrefsChanged(const std::string& pref_name) {
 // Android this includes checking the Android version in the field trial.
 bool ShouldEnableAsyncDns() {
   bool feature_can_be_enabled = true;
@@ -34,5 +34,5 @@ diff --git a/components/cronet/url_request_context_config.cc b/components/cronet
       const base::DictionaryValue* stale_dns_args = nullptr;
       if (!it.value().GetAsDictionary(&stale_dns_args)) {
 -- 
-2.7.4
+2.11.0

@@ -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
-@@ -839,6 +839,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+@@ -833,6 +833,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 ==
-@@ -2432,6 +2437,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2426,6 +2431,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kMaterialDesignIncognitoNTPName,
      flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
@@ -151,5 +151,5 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
 }
 
 -- 
-2.7.4
+2.11.0

@@ -109,5 +109,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
       <message name="IDS_UPDATING_CHROME" desc="String that indicates that Chrome is updating">
         Updating Chrome...
 -- 
-2.7.4
+2.11.0

@@ -196,5 +196,5 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
 -- 
-2.7.4
+2.11.0

@@ -33,5 +33,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
                     if (isCancelled()) return null;
                     refreshIncognitoModeDisabled();
 -- 
-2.7.4
+2.11.0

@@ -32,5 +32,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
 
     /**
 -- 
-2.7.4
+2.11.0

@@ -813,5 +813,5 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp
 // has replacement terms. Chrome treats such bookmarks as search engines rather
 // than true bookmarks.
 -- 
-2.7.4
+2.11.0

@@ -122,5 +122,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
   </release>
 </grit>
 -- 
-2.7.4
+2.11.0

@@ -309,5 +309,5 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
   "java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java",
   "java/src/org/chromium/chrome/browser/ActivityTaskDescriptionIconGenerator.java",
 -- 
-2.7.4
+2.11.0

@@ -65,5 +65,5 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 
 std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
 -- 
-2.7.4
+2.11.0

@@ -27,5 +27,5 @@ diff --git a/ui/gfx/animation/animation.cc b/ui/gfx/animation/animation.cc
 #endif
 
 -- 
-2.7.4
+2.11.0

@@ -23,5 +23,5 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 
 void LocalFrame::SetAdTrackerForTesting(AdTracker* ad_tracker) {
 -- 
-2.7.4
+2.11.0

@@ -41,5 +41,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
         <!-- Broadcast receiver that will be notified of account changes -->
         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
 -- 
-2.7.4
+2.11.0

@@ -21,5 +21,5 @@ diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc
 // Certificates made by CreateKeyAndSelfSignedCert will be signed using this
 // digest algorithm.
 -- 
-2.7.4
+2.11.0

@@ -26,5 +26,5 @@ diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
 // We use a separate histogram name for each platform to facilitate the
 // display of error codes by their symbolic name (since each platform has
 -- 
-2.7.4
+2.11.0

@@ -26,5 +26,5 @@ diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/b
 GURL GetClientReportUrl(const std::string& report_url) {
   GURL url(report_url);
 -- 
-2.7.4
+2.11.0

@@ -19,5 +19,5 @@ diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chr
       std::unique_ptr<ConfirmInfoBarDelegate>(
           new GoogleApiKeysInfoBarDelegate())));
 -- 
-2.7.4
+2.11.0

@@ -54,5 +54,5 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
   if (personal_data_ && client_)
     personal_data_->OnSyncServiceInitialized(client_->GetSyncService());
 -- 
-2.7.4
+2.11.0

@@ -26,5 +26,5 @@ diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser
   if (!extensions_enabled ||
       chromeos::ProfileHelper::IsLockScreenAppProfile(profile_)) {
 -- 
-2.7.4
+2.11.0

@@ -82,5 +82,5 @@ diff --git a/components/security_interstitials/core/safe_browsing_loud_error_ui.
 
 // Constants for the V4 phishing string upgrades.
 -- 
-2.7.4
+2.11.0

@@ -65,5 +65,5 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
 
 void ClientSideDetectionService::HandlePhishingVerdict(
 -- 
-2.7.4
+2.11.0

@@ -110,5 +110,5 @@ diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/componen
   current_load_ = network::SimpleURLLoader::Create(std::move(resource_request),
                                                    traffic_annotation);
 -- 
-2.7.4
+2.11.0

@@ -0,0 +1,179 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 18 Sep 2018 08:06:14 +0200
+Subject: Fixes for building without safebrowsing on Android
+
+---
+ .../android/java/res/xml/privacy_preferences.xml   | 12 -----
+ .../preferences/privacy/PrivacyPreferences.java    | 58 ----------------------
+ .../chrome_browsing_data_remover_delegate.cc       | 10 ----
+ .../chrome_resource_dispatcher_host_delegate.cc    |  2 +
+ 4 files changed, 2 insertions(+), 80 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
+@@ -25,18 +25,6 @@
+         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" />
+-    <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
+@@ -39,12 +39,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";
+-    private static final String PREF_SAFE_BROWSING_EXTENDED_REPORTING =
+-            "safe_browsing_extended_reporting";
+-    private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
+-            "safe_browsing_scout_reporting";
+     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";
+     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
+@@ -77,10 +72,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_EXTENDED_REPORTING));
+-            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));
+@@ -122,32 +113,11 @@ public class PrivacyPreferences extends PreferenceFragment
+             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
+         }
+ 
+-        // Listen to changes to both Extended Reporting prefs.
+-        ChromeBaseCheckBoxPreference legacyExtendedReportingPref =
+-                (ChromeBaseCheckBoxPreference) findPreference(
+-                    PREF_SAFE_BROWSING_EXTENDED_REPORTING);
+-        legacyExtendedReportingPref.setOnPreferenceChangeListener(this);
+-        legacyExtendedReportingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-        ChromeBaseCheckBoxPreference scoutReportingPref =
+-                (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING);
+-        scoutReportingPref.setOnPreferenceChangeListener(this);
+-        scoutReportingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-        // Remove the extended reporting preference that is NOT active.
+-        String extended_reporting_pref_to_remove =
+-                prefServiceBridge.isSafeBrowsingScoutReportingActive()
+-                    ? PREF_SAFE_BROWSING_EXTENDED_REPORTING : PREF_SAFE_BROWSING_SCOUT_REPORTING;
+-        preferenceScreen.removePreference(findPreference(extended_reporting_pref_to_remove));
+-
+         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);
+-        safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-
+         ChromeBaseCheckBoxPreference closeTabsOnExitPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+         closeTabsOnExitPref.setOnPreferenceChangeListener(this);
+@@ -161,12 +131,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_EXTENDED_REPORTING.equals(key)
+-                   || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
+-            PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
+-                    (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);
+@@ -225,21 +189,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
+         }
+ 
+-        String extended_reporting_pref = prefServiceBridge.isSafeBrowsingScoutReportingActive()
+-                ? PREF_SAFE_BROWSING_SCOUT_REPORTING : PREF_SAFE_BROWSING_EXTENDED_REPORTING;
+-        CheckBoxPreference extendedReportingPref =
+-                (CheckBoxPreference) findPreference(extended_reporting_pref);
+-        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) {
+@@ -276,13 +225,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+                 return prefs.isSearchSuggestManaged();
+             }
+-            if (PREF_SAFE_BROWSING_EXTENDED_REPORTING.equals(key)
+-                    || 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
+@@ -256,16 +256,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/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
+@@ -495,8 +495,10 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
+   // 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)
+-- 
+2.11.0
+
@@ -32,5 +32,5 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 
 Extension::ManifestData* Extension::GetManifestData(const std::string& key)
 -- 
-2.7.4
+2.11.0

@@ -27,5 +27,5 @@ diff --git a/components/translate/core/browser/translate_language_list.cc b/comp
 
 void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) {
 -- 
-2.7.4
+2.11.0

@@ -23,5 +23,5 @@ diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressio
     <ignore regexp="remoting/android/host/res/layout/main.xml"/>
   </issue>
 -- 
-2.7.4
+2.11.0

@@ -152,5 +152,5 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
 
     @Override
 -- 
-2.7.4
+2.11.0

@@ -799,5 +799,5 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
   }
 }
 -- 
-2.7.4
+2.11.0

@@ -128,5 +128,5 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
 
     @Override
 -- 
-2.7.4
+2.11.0

@@ -319,5 +319,5 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
         if (isGmsCoreSupported) {
             //FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request);
 -- 
-2.7.4
+2.11.0

@@ -45,5 +45,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
     private boolean mNativeInitialized;
 
 -- 
-2.7.4
+2.11.0

@@ -39,5 +39,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 
         // An optional page to select a default search engine.
 -- 
-2.7.4
+2.11.0
Author	SHA1	Message	Date
csagan5	ae8dce366b	Release 69.0.3497.113	2018-09-30 12:11:13 +02:00
csagan5	750cafb50c	Release 69.0.3497.109	2018-09-25 22:12:08 +02:00
csagan5	5cd90e8326	Updated README	2018-09-23 09:20:51 +02:00
csagan5	664cd20825	Release 69.0.3497.102	2018-09-23 09:04:17 +02:00
csagan5	aeb31bb4c5	Update version in issue template	2018-09-15 06:45:11 +02:00