Release 67.0.3396.95

Add bug report and feature request issue templates
Typo fix
2018-06-22 08:46:05 +02:00 · 2018-06-21 21:44:22 +02:00 · 2018-06-20 21:22:30 +02:00 · 2018-06-20 21:18:07 +02:00 · 2018-06-18 23:07:12 +02:00 · 2018-06-18 20:26:45 +02:00
64 changed files with 5772 additions and 586 deletions
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a Bromite bug report
+
+---
+
+**Version**
+
+Version: `v67...`
+Arch: `arm` or `arm64` or `x86`
+
+**Is the bug reproducible with latest version?**
+`Bug must be reproducible with latest version`
+
+**Can the bug be reproduced with corresponding [Chromium](https://github.com/bromite/chromium/releases) version?**
+`Bug must NOT be reproducible with Chromium to be qualified as a Bromite bug`
+
+**Is the bug a crash?**
+If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest a privacy-related idea for this project
+
+---
+
+**Is your feature request related to privacy?**
+Only privacy-related feature requests are considered.
+
+**Is there a patch available for this feature somewhere?**
+...
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
@@ -1,3 +1,49 @@
+# 67.0.3396.95
+* reduce headers sent in DoH requests (fixes https://github.com/bromite/bromite/issues/70)
+* serve DoH requests with maximum priority
+* `CloudFlare` -> `Cloudflare` (fixes https://github.com/bromite/bromite/issues/73)
+* fingerprint miitagions: cover also `ConvertToArrayBufferContents`
+* updated AdBlock filters
+
+# 67.0.3396.92
+* improve randomisation for each retrieved Canvas data (fixes https://github.com/bromite/bromite/issues/69)
+* updated AdBlock filters
+
+# 67.0.3396.88
+* add flag for DNS-over-HTTPS (Google experimental DNS) (fixes https://github.com/bromite/bromite/issues/68)
+* disable signin, translate and data saver UI/internal components (fixes https://github.com/bromite/bromite/issues/67)
+* rename `GoogleEN` -> `Google In English` (fixes https://github.com/bromite/bromite/issues/66)
+* re-enabled text metrics and ToDataURL, ToBlob with randomisation of color data (fixes https://github.com/bromite/bromite/issues/52)
+* open YouTube links in Bromite
+* use Android Media Player for URLs
+* add exit menu item
+* hide "send reports to Google" menu item
+* updated AdBlock filters
+
+# 67.0.3396.82
+* updated AdBlock filters
+
+# 67.0.3396.76
+* updated AdBlock filters
+
+# 67.0.3396.72
+* add global toggle for adblock engine (https://github.com/bromite/bromite/issues/53)
+* updated AdBlock filters
+
+# 67.0.3396.67
+* updated AdBlock filters
+
+# 66.0.3359.202
+* fix DevTools integration (https://github.com/bromite/bromite/issues/23)
+* allow toggling of Javascript from New Tab Page (fixes https://github.com/bromite/bromite/issues/60)
+* updated AdBlock filters
+
+# 66.0.3359.200
+* updated AdBlock filters
+
+# 66.0.3359.196
+* updated AdBlock filters
+
 # 66.0.3359.188
 * updated AdBlock filters
 * increase max (persistent) connections per server from 6 to 15
@@ -21,6 +21,8 @@ Minimal UI changes are applied to help curbing the idea of "browser as an advert

 Please donate to support development of Bromite and the costs for the build system.

+[Donate via LiberaPay](https://liberapay.com/csagan5/donate)
+
 Support development with a donation of 3 EUR: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)

 Support development with a free amount donation: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LC7Q6A3UAQPY8)
@@ -35,11 +37,15 @@ 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.

+## Does Bromite require root?
+No.
+
 ## 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.

-## Does Bromite require root?
-No.
+## How to enable DNS-over-HTTPS?
+
+See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).

 ## Can you add dark mode/some cool themes?
 No.
@@ -52,16 +58,16 @@ We cannot add add-ons to Bromite (merely some features) and anyway HTTPS everywh
 # Features

 * baked-in adblock engine with filters from EasyList, EasyPrivacy and others
-* remove click-tracking and AMP from Google search results
-* allow videos to play in background
-* [StartPage](https://startpage.com/) search engine
-* [DuckDuckGo](https://duckduckgo.com/) search engine
-* [Qwant](https://www.qwant.com/) search engine
-* Google search engine English-only with reduced tracking
-* privacy enhancement patches from Inox patchset, ungoogled-chromium and Iridium projects
+* remove click-tracking and AMP from search results
+* DNS-over-HTTPS support via Google/CloudFlare servers
+* allow playing videos in background
+* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
+* privacy enhancement patches from [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/), [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) and [Iridium](https://github.com/iridium-browser) projects
 * webRTC, canvas, audio and other anti-fingerprinting mitigations
 * all codecs included (proprietary, open H.264 etc.)
-* built with official optimizations
+* built with official speed optimizations
+
+You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/patches

 # Releases

@@ -70,7 +76,7 @@ All built versions are available as [releases](https://github.com/bromite/bromit
 Each tag corresponds to a Chromium release tag.

 Bromite is currently built for ARM, ARM64 and x86 and for the Android SDKs versions 16 and 21
-Additionally, SystemWebView, Monochrome and the vanilla Chromium builds are provided.
+Additionally, SystemWebView, Monochrome and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.

 # How to build

@@ -84,8 +90,9 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 * [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) for some patches
 * [Iridium project](https://github.com/iridium-browser) for some patches (taken from above ungoogled-chromium)
 * [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (taken from above ungoogled-chromium)
+* [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
 * nochromo for the original adblock patch
-* AdBlock Plus, uBlock, EasyList and EasyPrivacy for the filters included
+* [AdBlock Plus](https://adblockplus.org/), [uBlock](https://www.ublock.org/), [Peter Lowe's adservers list](https://pgl.yoyo.org/adservers/), [EasyList and EasyPrivacy](https://easylist.to/) for the filters included

 # License

@@ -1,27 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 22:47:49 +0200
-Subject: Disable the ad promo system by default
-
-author: Michael Gilbert <mgilbert@debian.org>
-bug-debian: http://bugs.debian.org/634101
---
- chrome/browser/ui/app_list/app_list_service.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc
--- a/chrome/browser/ui/app_list/app_list_service.cc
-+++ b/chrome/browser/ui/app_list/app_list_service.cc
-@@ -142,6 +142,10 @@ void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {
-   registry->RegisterIntegerPref(prefs::kAppListEnableMethod,
-                                 ENABLE_NOT_RECORDED);
-   registry->RegisterInt64Pref(prefs::kAppListEnableTime, 0);
-+
-+  // Identifies whether we should show the app launcher promo or not. This
-+  // becomes false when the user dismisses the promo.
-+  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
- }
- 
- // static
-- 
-2.7.4
-
@@ -0,0 +1,32 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 18 May 2018 10:10:00 +0200
+Subject: Increase maximum connections per host from 6 to 15
+
+---
+ net/socket/client_socket_pool_manager.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
+--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
+@@ -34,7 +34,7 @@ static_assert(arraysize(g_max_sockets_per_pool) ==
+                   HttpNetworkSession::NUM_SOCKET_POOL_TYPES,
+               "max sockets per pool length mismatch");
+ 
+-// Default to allow up to 6 connections per host. Experiment and tuning may
+// Default to allow up to 15 connections per host. Experiment and tuning may
+ // try other values (greater than 0).  Too large may cause many problems, such
+ // as home routers blocking the connections!?!?  See http://crbug.com/12066.
+ //
+@@ -43,7 +43,7 @@ static_assert(arraysize(g_max_sockets_per_pool) ==
+ // be the same as the limit for ws. Also note that Firefox uses a limit of 200.
+ // See http://crbug.com/486800
+ int g_max_sockets_per_group[] = {
+-    6,   // NORMAL_SOCKET_POOL
+    15,  // NORMAL_SOCKET_POOL
+     255  // WEBSOCKET_SOCKET_POOL
+ };
+ 
+-- 
+2.7.4
+
@@ -10,7 +10,7 @@ author: Chad Miller <chad.miller@canonical.com>
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -100,7 +100,7 @@ void CookieSettings::GetCookieSettings(
+@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -1,4 +1,4 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
+From: Jan Engelhardt <jengelh@inai.de>
 Date: Sun, 9 Nov 2014 01:54:27 +0100
 Subject: promo: disable Google promotion fetching

@@ -15,8 +15,6 @@ Whatever it is that it downloads, deactivate the one that leads to
 Google.

 References: https://github.com/iridium-browser/iridium-browser/issues/33
-
-author: Jan Engelhardt <jengelh@inai.de>
 ---
 chrome/browser/signin/signin_promo.cc | 1 +
 1 file changed, 1 insertion(+)
@@ -24,7 +24,7 @@ Subject: Modify default preferences
 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
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
 #endif
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 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
-@@ -880,7 +880,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -990,7 +990,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -48,7 +48,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
-@@ -642,7 +642,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -615,7 +615,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
                                std::string());
   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
   data_reduction_proxy::RegisterPrefs(registry);
@@ -104,7 +104,7 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
 +        <paper-checkbox id="sendSettings">
           $i18nRaw{resetPageFeedback}</paper-checkbox>
       </div>
-     </dialog>
+     </cr-dialog>
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
@@ -122,7 +122,7 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -65,11 +65,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -177,7 +177,7 @@ 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
-@@ -215,7 +215,7 @@ void AutofillManager::RegisterProfilePrefs(
+@@ -227,7 +227,7 @@ void AutofillManager::RegisterProfilePrefs(
   registry->RegisterIntegerPref(
       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
   registry->RegisterBooleanPref(
@@ -207,7 +207,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
-@@ -370,9 +370,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -374,9 +374,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -222,7 +222,7 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -330,14 +330,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+@@ -368,14 +368,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
   if (is_theme())
     return false;
 
@@ -20,8 +20,8 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
 -      prefs::kCredentialsEnableAutosignin, true,
 +      prefs::kCredentialsEnableAutosignin, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
-   registry->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false);
   registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
+                                PrefRegistry::NO_REGISTRATION_FLAGS);
 -- 
 2.7.4

@@ -9,7 +9,7 @@ Subject: Disable WebRTC by default
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -84,10 +84,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -89,10 +89,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
   // TODO(guoweis): Remove next 2 options at M50.
@@ -56,7 +56,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/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
-@@ -73,20 +73,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
+@@ -74,20 +74,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
             }
         });
 
@@ -0,0 +1,220 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 12 Jun 2018 14:23:07 +0200
+Subject: Disable signin and data saver preferences
+
+Never show the data saver promo snackbar
+---
+ chrome/android/java/res/xml/main_preferences.xml   |  8 +++---
+ .../chromium/chrome/browser/ChromeActivity.java    |  6 ++--
+ .../browser/preferences/MainPreferences.java       | 32 ++++++++++++----------
+ 3 files changed, 26 insertions(+), 20 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
+++ b/chrome/android/java/res/xml/main_preferences.xml
+@@ -6,10 +6,10 @@
+ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+     android:orderingFromXml="false">
+ 
+-    <org.chromium.chrome.browser.preferences.SignInPreference
+    <!-- org.chromium.chrome.browser.preferences.SignInPreference
+         android:key="sign_in"
+         android:order="0"
+-        android:title="@string/sign_in_to_chrome"/>
+        android:title="@string/sign_in_to_chrome"/-->
+ 
+     <PreferenceCategory
+         android:key="basics_section"
+@@ -70,11 +70,11 @@
+         android:key="languages"
+         android:order="12"
+         android:title="@string/prefs_languages"/>
+-    <org.chromium.chrome.browser.preferences.ChromeBasePreference
+    <!-- org.chromium.chrome.browser.preferences.ChromeBasePreference
+         android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences"
+         android:key="data_reduction"
+         android:order="13"
+-        android:title="@string/data_reduction_title"/>
+        android:title="@string/data_reduction_title"/-->
+     <org.chromium.chrome.browser.preferences.ChromeBasePreference
+         android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
+         android:key="downloads"
+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
+@@ -114,7 +114,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;
+-import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
+//import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
+ import org.chromium.chrome.browser.snackbar.DataUseSnackbarController;
+ import org.chromium.chrome.browser.snackbar.SnackbarManager;
+ import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
+@@ -255,7 +255,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+     private SnackbarManager mSnackbarManager;
+     private ModalDialogManager mModalDialogManager;
+     private DataUseSnackbarController mDataUseSnackbarController;
+-    private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
+    //private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
+     private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate;
+     private AppMenuHandler mAppMenuHandler;
+     private ToolbarManager mToolbarManager;
+@@ -576,6 +576,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+                     mDataUseSnackbarController.showDataUseTrackingEndedBar();
+                 }
+ 
+/*
+                 // 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.
+                 if (DataReductionProxySettings.getInstance().isSnackbarPromoAllowed(tab.getUrl())) {
+@@ -588,6 +589,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+                             DataReductionProxySettings.getInstance()
+                                     .getTotalHttpContentLengthSaved());
+                 }
+*/
+             }
+ 
+             @Override
+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
+@@ -18,9 +18,9 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.autofill.PersonalDataManager;
+ import org.chromium.chrome.browser.contextual_suggestions.EnabledStateMonitor;
+-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.preferences.datareduction.DataReductionPreferences;
+//import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
+ import org.chromium.chrome.browser.search_engines.TemplateUrlService;
+ import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
+ import org.chromium.chrome.browser.signin.SigninManager;
+@@ -35,20 +35,20 @@ import java.util.Map;
+  */
+ public class MainPreferences extends PreferenceFragment
+         implements SigninManager.SignInStateObserver, TemplateUrlService.LoadListener {
+-    public static final String PREF_SIGN_IN = "sign_in";
+    //public static final String PREF_SIGN_IN = "sign_in";
+     public static final String PREF_AUTOFILL_SETTINGS = "autofill_settings";
+     public static final String PREF_SEARCH_ENGINE = "search_engine";
+     public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
+     public static final String PREF_CONTEXTUAL_SUGGESTIONS = "contextual_suggestions";
+     public static final String PREF_HOMEPAGE = "homepage";
+-    public static final String PREF_DATA_REDUCTION = "data_reduction";
+    //public static final String PREF_DATA_REDUCTION = "data_reduction";
+     public static final String PREF_NOTIFICATIONS = "notifications";
+     public static final String PREF_LANGUAGES = "languages";
+     public static final String PREF_DOWNLOADS = "downloads";
+ 
+     private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
+     private final Map<String, Preference> mAllPreferences = new HashMap<>();
+-    private SignInPreference mSignInPreference;
+    //private SignInPreference mSignInPreference;
+ 
+     public MainPreferences() {
+         setHasOptionsMenu(true);
+@@ -64,25 +64,29 @@ public class MainPreferences extends PreferenceFragment
+     @Override
+     public void onDestroy() {
+         super.onDestroy();
+-        mSignInPreference.onPreferenceFragmentDestroyed();
+        //mSignInPreference.onPreferenceFragmentDestroyed();
+     }
+ 
+     @Override
+     public void onStart() {
+         super.onStart();
+/*
+         if (SigninManager.get().isSigninSupported()) {
+             SigninManager.get().addSignInStateObserver(this);
+             mSignInPreference.registerForUpdates();
+         }
+*/
+     }
+ 
+     @Override
+     public void onStop() {
+         super.onStop();
+/*
+         if (SigninManager.get().isSigninSupported()) {
+             SigninManager.get().removeSignInStateObserver(this);
+             mSignInPreference.unregisterForUpdates();
+         }
+*/
+     }
+ 
+     @Override
+@@ -98,7 +102,7 @@ public class MainPreferences extends PreferenceFragment
+         setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
+         setManagedPreferenceDelegateForPreference(PREF_AUTOFILL_SETTINGS);
+         setManagedPreferenceDelegateForPreference(PREF_SAVED_PASSWORDS);
+-        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
+@@ -154,7 +158,7 @@ public class MainPreferences extends PreferenceFragment
+             Preference preference = getPreferenceScreen().getPreference(index);
+             mAllPreferences.put(preference.getKey(), preference);
+         }
+-        mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
+        //mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
+     }
+ 
+     private void setManagedPreferenceDelegateForPreference(String key) {
+@@ -163,12 +167,6 @@ public class MainPreferences extends PreferenceFragment
+     }
+ 
+     private void updatePreferences() {
+-        if (SigninManager.get().isSigninSupported()) {
+-            addPreferenceIfAbsent(PREF_SIGN_IN);
+-        } else {
+-            removePreferenceIfPresent(PREF_SIGN_IN);
+-        }
+-
+         updateSearchEnginePreference();
+ 
+         if (HomepageManager.shouldShowHomepageSetting()) {
+@@ -187,9 +185,11 @@ public class MainPreferences extends PreferenceFragment
+             removePreferenceIfPresent(PREF_CONTEXTUAL_SUGGESTIONS);
+         }
+ 
+/*
+         ChromeBasePreference dataReduction =
+                 (ChromeBasePreference) findPreference(PREF_DATA_REDUCTION);
+         dataReduction.setSummary(DataReductionPreferences.generateSummary(getResources()));
+*/
+     }
+ 
+     private Preference addPreferenceIfAbsent(String key) {
+@@ -260,9 +260,11 @@ public class MainPreferences extends PreferenceFragment
+                 if (PREF_SAVED_PASSWORDS.equals(preference.getKey())) {
+                     return PrefServiceBridge.getInstance().isRememberPasswordsManaged();
+                 }
+/*
+                 if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
+                     return DataReductionProxySettings.getInstance().isDataReductionProxyManaged();
+                 }
+*/
+                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
+                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
+                 }
+@@ -280,11 +282,13 @@ public class MainPreferences extends PreferenceFragment
+                     return prefs.isRememberPasswordsManaged()
+                             && !prefs.isRememberPasswordsEnabled();
+                 }
+/*
+                 if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
+                     DataReductionProxySettings settings = DataReductionProxySettings.getInstance();
+                     return settings.isDataReductionProxyManaged()
+                             && !settings.isDataReductionProxyEnabled();
+                 }
+*/
+                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
+                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
+                 }
+-- 
+2.7.4
+
@@ -0,0 +1,32 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 12 Jun 2018 15:09:26 +0200
+Subject: Disable signin/data reduction promos
+
+---
+ .../java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java    | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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
+@@ -562,7 +562,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.
+-            boolean isShowingPromo = mLocaleManager.hasShownSearchEnginePromoThisSession();
+            /*boolean isShowingPromo = mLocaleManager.hasShownSearchEnginePromoThisSession();
+             // 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()
+@@ -581,7 +581,7 @@ public class ChromeTabbedActivity
+                 preferenceManager.setPromosSkippedOnFirstStart(true);
+             }
+ 
+-            if (!isShowingPromo) {
+            if (!isShowingPromo) */ {
+                 final Tracker tracker =
+                         TrackerFactory.getTrackerForProfile(Profile.getLastUsedProfile());
+                 tracker.addOnInitializedCallback(
+-- 
+2.7.4
+
@@ -0,0 +1,156 @@
+From: Serg <serg.zhukovsky@gmail.com>
+Date: Wed, 22 Mar 2017 19:10:30 -0400
+Subject: Removed Sync and Translate menu
+
+---
+ .../java/res/drawable-hdpi/settings_translate.png  | Bin 399 -> 0 bytes
+ .../java/res/drawable-mdpi/settings_translate.png  | Bin 284 -> 0 bytes
+ .../java/res/drawable-xhdpi/settings_translate.png | Bin 547 -> 0 bytes
+ .../res/drawable-xxhdpi/settings_translate.png     | Bin 793 -> 0 bytes
+ .../res/drawable-xxxhdpi/settings_translate.png    | Bin 1038 -> 0 bytes
+ .../java/res/xml/site_settings_preferences.xml     |   8 +++----
+ .../website/SiteSettingsPreferences.java           |  26 ++++++++++-----------
+ 7 files changed, 17 insertions(+), 17 deletions(-)
+ delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xxhdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
+
+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
+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
+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
+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
+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
+diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
+--- a/chrome/android/java/res/xml/site_settings_preferences.xml
+++ b/chrome/android/java/res/xml/site_settings_preferences.xml
+@@ -44,9 +44,9 @@
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+         android:key="ads" />
+     <!-- Background sync -->
+-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <!--<org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+-        android:key="background_sync" />
+        android:key="background_sync" />-->
+     <!-- Protected content -->
+     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+@@ -66,11 +66,11 @@
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+         android:key="sound" />
+     <!-- Google Translate -->
+-    <Preference
+    <!-- <Preference
+         android:fragment="org.chromium.chrome.browser.preferences.website.TranslatePreferences"
+         android:key="translate"
+         android:title="@string/google_translate"
+-        android:icon="@drawable/settings_translate" />
+        android:icon="@drawable/settings_translate" />-->
+     <!-- Storage -->
+     <!-- 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
+--- 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
+@@ -38,7 +38,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     static final String ALL_SITES_KEY = "all_sites";
+     static final String ADS_KEY = "ads";
+     static final String AUTOPLAY_KEY = "autoplay";
+-    static final String BACKGROUND_SYNC_KEY = "background_sync";
+    //static final String BACKGROUND_SYNC_KEY = "background_sync";
+     static final String CAMERA_KEY = "camera";
+     static final String CLIPBOARD_KEY = "clipboard";
+     static final String COOKIES_KEY = "cookies";
+@@ -51,7 +51,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     static final String PROTECTED_CONTENT_KEY = "protected_content";
+     static final String SOUND_KEY = "sound";
+     static final String STORAGE_KEY = "use_storage";
+-    static final String TRANSLATE_KEY = "translate";
+    //static final String TRANSLATE_KEY = "translate";
+     static final String USB_KEY = "usb";
+ 
+     // Whether the Protected Content menu is available for display.
+@@ -86,8 +86,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             return ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS;
+         } else if (AUTOPLAY_KEY.equals(key)) {
+             return ContentSettingsType.CONTENT_SETTINGS_TYPE_AUTOPLAY;
+-        } else if (BACKGROUND_SYNC_KEY.equals(key)) {
+-            return ContentSettingsType.CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC;
+        /*} else if (BACKGROUND_SYNC_KEY.equals(key)) {
+            return ContentSettingsType.CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC;*/
+         } else if (CAMERA_KEY.equals(key)) {
+             return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
+         } else if (CLIPBOARD_KEY.equals(key)) {
+@@ -118,7 +118,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             // menus.
+             getPreferenceScreen().removePreference(findPreference(ALL_SITES_KEY));
+             getPreferenceScreen().removePreference(findPreference(ADS_KEY));
+-            getPreferenceScreen().removePreference(findPreference(BACKGROUND_SYNC_KEY));
+            //getPreferenceScreen().removePreference(findPreference(BACKGROUND_SYNC_KEY));
+             getPreferenceScreen().removePreference(findPreference(CAMERA_KEY));
+             getPreferenceScreen().removePreference(findPreference(CLIPBOARD_KEY));
+             getPreferenceScreen().removePreference(findPreference(COOKIES_KEY));
+@@ -130,7 +130,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             getPreferenceScreen().removePreference(findPreference(POPUPS_KEY));
+             getPreferenceScreen().removePreference(findPreference(SOUND_KEY));
+             getPreferenceScreen().removePreference(findPreference(STORAGE_KEY));
+-            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+            //getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+             getPreferenceScreen().removePreference(findPreference(USB_KEY));
+         } else {
+             // If both Autoplay and Protected Content menus are available, they'll be tucked under
+@@ -156,9 +156,9 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             }
+             // The new Languages Preference *feature* is an advanced version of this translate
+             // preference. Once Languages Preference is enabled, remove this setting.
+-            if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
+            /*if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
+                 getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+-            }
+            }*/
+         }
+     }
+ 
+@@ -166,10 +166,10 @@ public class SiteSettingsPreferences extends PreferenceFragment
+         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
+ 
+         // Translate preference.
+-        Preference translatePref = findPreference(TRANSLATE_KEY);
+        /*Preference translatePref = findPreference(TRANSLATE_KEY);
+         if (translatePref != null) {
+             setTranslateStateSummary(translatePref);
+-        }
+        }*/
+ 
+         // Preferences that navigate to Website Settings.
+         List<String> websitePrefs = new ArrayList<String>();
+@@ -183,7 +183,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             // When showing the main menu, if Protected Content is not available, only Autoplay
+             // will be visible.
+             if (!mProtectedContentMenuAvailable) websitePrefs.add(AUTOPLAY_KEY);
+-            websitePrefs.add(BACKGROUND_SYNC_KEY);
+            //websitePrefs.add(BACKGROUND_SYNC_KEY);
+             websitePrefs.add(CAMERA_KEY);
+             if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
+                 websitePrefs.add(CLIPBOARD_KEY);
+@@ -208,8 +208,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
+                 checked = PrefServiceBridge.getInstance().adsEnabled();
+             } else if (AUTOPLAY_KEY.equals(prefName)) {
+                 checked = PrefServiceBridge.getInstance().isAutoplayEnabled();
+-            } else if (BACKGROUND_SYNC_KEY.equals(prefName)) {
+-                checked = PrefServiceBridge.getInstance().isBackgroundSyncAllowed();
+            /*} else if (BACKGROUND_SYNC_KEY.equals(prefName)) {
+                checked = PrefServiceBridge.getInstance().isBackgroundSyncAllowed();*/
+             } else if (CAMERA_KEY.equals(prefName)) {
+                 checked = PrefServiceBridge.getInstance().isCameraEnabled();
+             } else if (CLIPBOARD_KEY.equals(prefName)) {
+-- 
+2.7.4
+
@@ -9,7 +9,7 @@ Subject: Disable Omaha update checks
 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
-@@ -122,7 +122,7 @@ public class OmahaBase {
+@@ -132,7 +132,7 @@ public class OmahaBase {
 
     /** See {@link #sIsDisabled}. */
     static boolean isDisabled() {
@@ -1,6 +1,6 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Mon, 11 Dec 2017 22:42:11 +0100
-Subject: Added Google English-only engine
+Subject: Add Google English-only engine

 Add a Google search engine that forces languages to English,
 disable from all its searches RLZ and field experiments querystring parameters.
@@ -27,8 +27,8 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
     },
 
 +    "googleen": {
-+      "name": "GoogleEN",
-+      "keyword": "google.co.uk",
+      "name": "Google in English",
+      "keyword": "googleen",
 +      "favicon_url": "https://www.google.com/favicon.ico",
 +      "search_url": "{google:baseURL}search?q={searchTerms}&{google:originalQueryForSuggestion}{google:iOSSearchLanguage}{google:searchClient}{google:contextualSearchVersion}ie={inputEncoding}&hl=en",
 +      "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:pageClassification}{google:searchVersion}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}&hl=en",
@@ -9,7 +9,7 @@ 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
-@@ -623,6 +623,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+@@ -632,6 +632,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
   GURL canonical_requesting_origin =
       GetCanonicalOrigin(requesting_origin, embedding_origin);
   PermissionContextBase* context = GetPermissionContext(permission);
@@ -3,35 +3,36 @@ Date: Sat, 28 Oct 2017 10:09:41 +0200
 Subject: Cure AMP and tracking from search results

 ---
- third_party/WebKit/Source/core/dom/BUILD.gn           |  1 +
- third_party/WebKit/Source/core/dom/Document.cpp       | 19 ++++++++++++++++++-
- .../WebKit/Source/core/dom/extensions/anti_amp_cure.h |  6 ++++++
- 3 files changed, 25 insertions(+), 1 deletion(-)
- create mode 100644 third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
+ third_party/blink/renderer/core/dom/BUILD.gn         |  1 +
+ third_party/blink/renderer/core/dom/document.cc      | 20 +++++++++++++++++++-
+ .../renderer/core/dom/extensions/anti_amp_cure.h     |  6 ++++++
+ 3 files changed, 26 insertions(+), 1 deletion(-)
+ create mode 100644 third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h

-diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
--- a/third_party/WebKit/Source/core/dom/BUILD.gn
-+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -301,6 +301,7 @@ blink_core_sources("dom") {
-     "events/TreeScopeEventContext.h",
-     "events/WindowEventContext.cpp",
-     "events/WindowEventContext.h",
+diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
+--- a/third_party/blink/renderer/core/dom/BUILD.gn
+++ b/third_party/blink/renderer/core/dom/BUILD.gn
+@@ -147,6 +147,7 @@ blink_core_sources("dom") {
+     "events/tree_scope_event_context.h",
+     "events/window_event_context.cc",
+     "events/window_event_context.h",
 +    "extensions/dont-track-me.h",
-     "ng/flat_tree_traversal_ng.cc",
-     "ng/flat_tree_traversal_ng.h",
-     "trustedtypes/TrustedHTML.cpp",
-diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
--- a/third_party/WebKit/Source/core/dom/Document.cpp
-+++ b/third_party/WebKit/Source/core/dom/Document.cpp
-@@ -220,6 +220,7 @@
- #include "core/xml/parser/XMLDocumentParser.h"
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
+     "exception_code.h",
+     "first_letter_pseudo_element.cc",
+     "first_letter_pseudo_element.h",
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -276,6 +276,8 @@
+ #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
+ #include "third_party/blink/renderer/platform/wtf/time.h"
+ 
 +#include "extensions/anti_amp_cure.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5804,8 +5805,24 @@ void Document::FinishedParsing() {
+
+ #ifndef NDEBUG
+ using WeakDocumentSet =
+     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
+@@ -5839,8 +5841,24 @@ void Document::FinishedParsing() {
     fetcher_->ClearResourcesFromPreviousFetcher();
   }
 
@@ -57,15 +58,15 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
 }
 
 void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
+diff --git a/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
 new file mode 100644
 --- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
+++ b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
@@ -0,0 +1,6 @@
 +#ifndef anti_amp_cure_h
 +#define anti_amp_cure_h
 +
-+#define ANTI_AMP_CURE_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks());\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('mlogo');\n      if (mlogo) {\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks() {\n    var saned = 0, total = 0;\n    document.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n//    document.addEventListener('touchstart', handlePointerPress, true);\n    sanitizeAll();\n}\nsetMlogoClick();\n"
+#define ANTI_AMP_CURE_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks(document));\n}\n\nfunction hookMoreResults() {\n      var extrares = document.getElementById('extrares');\n      if (!extrares) {\n         console.log(\"could not hook more results\");\n         return;\n      }\n      // mutation observers are great but they don't work\n      extrares.addEventListener(\"DOMNodeInserted\", function(e) {\n         var node = e.target;\n         if (node.id && node.id.startsWith(\"arc-srp\"))\n             console.log(\"hyperlinks sanitized on new result node: \", sanitizeAllHyperlinks(node));\n      });\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('qslc');\n      if (mlogo && mlogo.children[0]) {\n        mlogo = mlogo.children[0];\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks(rootNode) {\n    var saned = 0, total = 0;\n    rootNode.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n    sanitizeAll();\n}\nsetMlogoClick();\n\nhookMoreResults();\n"
 +
 +#endif  // anti_amp_cure_h
 -- 
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 12 Jun 2018 15:03:29 +0200
+Subject: Hide "Send reports to Google"
+
+---
+ chrome/android/java/res/layout/fre_tosanduma.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -70,7 +70,7 @@
+                         android:layout_height="wrap_content"
+                         android:lineSpacingMultiplier="1.4"
+                         android:text="@string/fre_send_report_check"
+-                        android:textAppearance="@style/BlackBodyDefault" />
+                        android:textAppearance="@style/BlackBodyDefault" android:visibility = "gone" />
+                     </LinearLayout>
+             </LinearLayout>
+         </LinearLayout>
+-- 
+2.7.4
+
@@ -10,7 +10,7 @@ Subject: ungoogled-chromium: Disable signin
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
-@@ -76,12 +76,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
+@@ -77,12 +77,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
   ShowSingletonTabOverwritingNTP(browser, params);
 }
 
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.
 // Shows either the help app or the appropriate help page for |source|. If
 // |browser| is NULL and the help page is used (vs the app), the help page is
 // shown in the last active browser. If there is no such browser, a new browser
-@@ -396,6 +390,7 @@ void ShowSearchEngineSettings(Browser* browser) {
+@@ -397,6 +391,7 @@ void ShowSearchEngineSettings(Browser* browser) {
 #if !defined(OS_ANDROID)
 void ShowBrowserSignin(Browser* browser,
                        signin_metrics::AccessPoint access_point) {
@@ -31,9 +31,9 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.
   Profile* original_profile = browser->profile()->GetOriginalProfile();
   SigninManagerBase* manager =
       SigninManagerFactory::GetForProfile(original_profile);
-@@ -436,6 +431,7 @@ void ShowBrowserSignin(Browser* browser,
-             false));
-     DCHECK_GT(browser->tab_strip_model()->count(), 0);
+@@ -442,6 +437,7 @@ void ShowBrowserSignin(Browser* browser,
+         BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
+         signin::ManageAccountsParams(), access_point, false);
   }
 +#endif 
 }
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/and
 diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
 --- a/chrome/browser/plugins/plugins_resource_service.cc
 +++ b/chrome/browser/plugins/plugins_resource_service.cc
-@@ -52,9 +52,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
+@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
 // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
 const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
 
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser
 GURL GetPluginsServerURL() {
   std::string filename;
 #if defined(OS_WIN)
-@@ -69,7 +66,7 @@ GURL GetPluginsServerURL() {
+@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() {
 #error Unknown platform
 #endif
 
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser
 diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
-@@ -34,8 +34,6 @@ namespace safe_browsing {
+@@ -35,8 +35,6 @@ namespace safe_browsing {
 // Model Loader strings
 const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
 const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
@@ -59,39 +59,39 @@ diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/b
 const char ModelLoader::kClientModelNamePattern[] =
     "client_model_v5%s_variation_%d.pb";
 const char ModelLoader::kClientModelFinchExperiment[] =
-@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
-                          net::URLRequestContextGetter* request_context_getter,
-                          bool is_extended_reporting)
+@@ -90,7 +88,7 @@ ModelLoader::ModelLoader(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     bool is_extended_reporting)
     : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
 -      url_(kClientModelUrlPrefix + name_),
 +      url_("about:blank"),
       update_renderers_callback_(update_renderers_callback),
-       request_context_getter_(request_context_getter),
+       url_loader_factory_(url_loader_factory),
       weak_factory_(this) {
-@@ -99,7 +97,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
- ModelLoader::ModelLoader(base::Closure update_renderers_callback,
-                          const std::string& model_name)
+@@ -103,7 +101,7 @@ ModelLoader::ModelLoader(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     const std::string& model_name)
     : name_(model_name),
 -      url_(kClientModelUrlPrefix + name_),
 +      url_("about:blank"),
       update_renderers_callback_(update_renderers_callback),
-       request_context_getter_(NULL),
+       url_loader_factory_(url_loader_factory),
       weak_factory_(this) {
 diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h
 --- a/chrome/browser/safe_browsing/client_side_model_loader.h
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.h
-@@ -43,7 +43,6 @@ class ModelLoader : public net::URLFetcherDelegate {
+@@ -42,7 +42,6 @@ class ModelLoader {
   static const int kClientModelFetchIntervalMs;
   static const char kClientModelFinchExperiment[];
   static const char kClientModelFinchParam[];
 -  static const char kClientModelUrlPrefix[];
   static const char kClientModelNamePattern[];
 
-   // Constructs a model loader to fetch a model using |request_context_getter|.
+   // Constructs a model loader to fetch a model using |url_loader_factory|.
 diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
 --- a/rlz/lib/financial_ping.cc
 +++ b/rlz/lib/financial_ping.cc
-@@ -366,7 +366,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
+@@ -351,7 +351,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
 
   // Open network connection.
   InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -99,9 +99,9 @@ diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
 +      "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
       INTERNET_FLAG_NO_CACHE_WRITE, 0);
   if (!connection_handle)
-     return false;
-@@ -410,7 +410,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
-   return true;
+     return PING_FAILURE;
+@@ -395,7 +395,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
+   return PING_SUCCESSFUL;
 #else
   std::string url =
 -      base::StringPrintf("https://%s%s", kFinancialServer, request);
@@ -12,8 +12,8 @@ See this page for more information: https://mikewest.org/2012/02/chrome-connects
 diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
 --- a/chrome/browser/intranet_redirect_detector.cc
 +++ b/chrome/browser/intranet_redirect_detector.cc
-@@ -72,9 +72,7 @@ void IntranetRedirectDetector::FinishSleep() {
-   fetchers_.clear();
+@@ -75,9 +75,7 @@ void IntranetRedirectDetector::FinishSleep() {
+   simple_loaders_.clear();
   resulting_origins_.clear();
 
 -  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
@@ -21,7 +21,7 @@ diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intra
 -    return;
 +  return;
 
-   DCHECK(fetchers_.empty() && resulting_origins_.empty());
+   DCHECK(simple_loaders_.empty() && resulting_origins_.empty());
 
 -- 
 2.7.4
@@ -7,9 +7,9 @@ Disables various detections of Google hosts and functionality specific to them
 .../page_load_metrics/page_load_metrics_util.cc    |   4 +-
 .../page_load_metrics/page_load_metrics_util.cc    |  33 +---
 components/google/core/browser/google_util.cc      | 193 ++-------------------
- components/search_engines/template_url.cc          |   5 -
+ components/search_engines/template_url.cc          |   6 +-
 net/base/url_util.cc                               |  22 ---
- 5 files changed, 13 insertions(+), 244 deletions(-)
+ 5 files changed, 14 insertions(+), 244 deletions(-)

 diff --git a/chrome/browser/page_load_metrics/page_load_metrics_util.cc b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
 --- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc
@@ -324,22 +324,23 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -510,11 +510,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
+@@ -510,11 +510,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
 bool TemplateURLRef::HasGoogleBaseURLs(
     const SearchTermsData& search_terms_data) const {
   ParseIfNecessary(search_terms_data);
-  for (size_t i = 0; i < replacements_.size(); ++i) {
-    if ((replacements_[i].type == GOOGLE_BASE_URL) ||
-        (replacements_[i].type == GOOGLE_BASE_SUGGEST_URL))
-      return true;
-  }
-   return false;
+-  return std::any_of(replacements_.begin(), replacements_.end(),
+-                     [](const Replacement& replacement) {
+-                       return replacement.type == GOOGLE_BASE_URL ||
+-                              replacement.type == GOOGLE_BASE_SUGGEST_URL;
+-                     });
+  return false;
 }
 
+ bool TemplateURLRef::ExtractSearchTermsFromURL(
 diff --git a/net/base/url_util.cc b/net/base/url_util.cc
 --- a/net/base/url_util.cc
 +++ b/net/base/url_util.cc
-@@ -397,28 +397,6 @@ void GetIdentityFromURL(const GURL& url,
+@@ -383,28 +383,6 @@ void GetIdentityFromURL(const GURL& url,
 }
 
 bool HasGoogleHost(const GURL& url) {
@@ -18,7 +18,7 @@ See also: https://github.com/Eloston/ungoogled-chromium/issues/104
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -299,7 +299,6 @@
+@@ -301,7 +301,6 @@
       <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
       <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
       <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
       <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
-@@ -435,7 +434,6 @@
+@@ -436,7 +435,6 @@
       </if>
       <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
       <include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />
@@ -93,7 +93,7 @@ diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/
 diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
 --- a/google_apis/gaia/gaia_auth_fetcher.cc
 +++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -219,35 +219,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+@@ -248,35 +248,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
     int load_flags,
     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -19,7 +19,7 @@ Adds a menu item under "More tools" to clear the HTTP authentication cache on de
 diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
 --- a/chrome/app/chrome_command_ids.h
 +++ b/chrome/app/chrome_command_ids.h
-@@ -150,6 +150,7 @@
+@@ -152,6 +152,7 @@
 #define IDC_DEV_TOOLS_INSPECT           40023
 #define IDC_UPGRADE_DIALOG              40024
 #define IDC_VIEW_INCOMPATIBILITIES      40025
@@ -30,7 +30,7 @@ diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -1050,6 +1050,9 @@ are declared in build/common.gypi.
+@@ -1053,6 +1053,9 @@ are declared in build/common.gypi.
         <message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
           &amp;Clear browsing data...
         </message>
@@ -40,7 +40,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
         <message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
           &amp;Downloads
         </message>
-@@ -1088,6 +1091,9 @@ are declared in build/common.gypi.
+@@ -1091,6 +1094,9 @@ are declared in build/common.gypi.
         <message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
           &amp;Clear Browsing Data...
         </message>
@@ -53,9 +53,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -59,6 +59,9 @@
+@@ -60,6 +60,9 @@
 #include "extensions/browser/extension_system.h"
- #include "printing/features/features.h"
+ #include "printing/buildflags/buildflags.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 +#include "net/url_request/url_request_context.h"
 +#include "net/url_request/url_request_context_getter.h"
@@ -63,7 +63,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/browser_commands_mac.h"
-@@ -624,6 +627,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -629,6 +632,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
     case IDC_CLEAR_BROWSING_DATA:
       ShowClearBrowsingDataDialog(browser_);
       break;
@@ -73,7 +73,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
     case IDC_IMPORT_SETTINGS:
       ShowImportDialog(browser_);
       break;
-@@ -865,6 +871,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -871,6 +877,7 @@ void BrowserCommandController::InitCommandState() {
                                         !profile()->IsOffTheRecord());
   command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
                                         !guest_session);
@@ -157,7 +157,7 @@ diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -47004,6 +47004,7 @@ Called by update_traffic_annotation_histograms.py.-->
+@@ -48315,6 +48315,7 @@ Full version information for the fingerprint enum values:
   <int value="48" label="Open in Chrome"/>
   <int value="49" label="Site Settings"/>
   <int value="50" label="App Info"/>
@@ -168,7 +168,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -104632,6 +104632,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
+@@ -107947,6 +107947,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <suffix name="Overestimate"
       label="Tracks when the compositor's estimates were too high and by how
              much."/>
@@ -0,0 +1,50 @@
+From: Serg <serg.zhukovsky@gmail.com>
+Date: Tue, 31 Jan 2017 22:12:27 -0500
+Subject: Added exit menu item
+
+---
+ chrome/android/java/res/menu/main_menu.xml                             | 2 ++
+ .../android/java/src/org/chromium/chrome/browser/ChromeActivity.java   | 2 ++
+ chrome/android/java/strings/android_chrome_strings.grd                 | 3 +++
+ 3 files changed, 7 insertions(+)
+
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -78,6 +78,8 @@
+             android:title="@string/menu_help" />
+         <item android:id="@+id/enter_vr_id"
+             android:title="@string/enter_vr" />
+        <item android:id="@+id/exit_id"
+            android:title="@string/menu_exit" />
+     </group>
+ 
+     <!-- Items shown only in the tab switcher -->
+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
+@@ -1951,6 +1951,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             RecordUserAction.record("MobileMenuSettings");
+         } else if (id == R.id.show_menu) {
+             showAppMenuForKeyboardEvent();
+        } else if (id == R.id.exit_id) {
+            ApplicationLifetime.terminate(false);
+         } else if (id == R.id.find_in_page_id) {
+             if (mFindToolbarManager == null) return false;
+ 
+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
+@@ -2563,6 +2563,9 @@ Google may use your browsing activity, content on some sites you visit, and othe
+       <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
+         Settings
+       </message>
+      <message name="IDS_MENU_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">
+        Exit
+      </message>
+       <message name="IDS_MENU_CLOSE_ALL_TABS" desc="Menu item for closing all open tabs. [CHAR-LIMIT=27]">
+         Close all tabs
+       </message>
+-- 
+2.7.4
+
@@ -5,35 +5,35 @@ Subject: Play videos in background
 Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com
 Original Javascript code by timdream
 ---
- third_party/WebKit/Source/core/dom/BUILD.gn             |  1 +
- third_party/WebKit/Source/core/dom/Document.cpp         | 17 +++++++++++++----
- .../WebKit/Source/core/dom/extensions/video_bg_play.h   |  6 ++++++
+ third_party/blink/renderer/core/dom/BUILD.gn            |  1 +
+ third_party/blink/renderer/core/dom/document.cc         | 17 +++++++++++++----
+ .../blink/renderer/core/dom/extensions/video_bg_play.h  |  6 ++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
- create mode 100644 third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+ create mode 100644 third_party/blink/renderer/core/dom/extensions/video_bg_play.h

-diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
--- a/third_party/WebKit/Source/core/dom/BUILD.gn
-+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -302,6 +302,7 @@ blink_core_sources("dom") {
-     "events/WindowEventContext.cpp",
-     "events/WindowEventContext.h",
+diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
+--- a/third_party/blink/renderer/core/dom/BUILD.gn
+++ b/third_party/blink/renderer/core/dom/BUILD.gn
+@@ -148,6 +148,7 @@ blink_core_sources("dom") {
+     "events/window_event_context.cc",
+     "events/window_event_context.h",
     "extensions/dont-track-me.h",
 +    "extensions/video-bg-play.h",
-     "ng/flat_tree_traversal_ng.cc",
-     "ng/flat_tree_traversal_ng.h",
-     "trustedtypes/TrustedHTML.cpp",
-diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
--- a/third_party/WebKit/Source/core/dom/Document.cpp
-+++ b/third_party/WebKit/Source/core/dom/Document.cpp
+     "exception_code.h",
+     "first_letter_pseudo_element.cc",
+     "first_letter_pseudo_element.h",
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -221,6 +221,7 @@
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
- #include "extensions/anti_amp_cure.h"
+ #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
+ #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
+ #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
 +#include "extensions/video_bg_play.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5812,17 +5813,25 @@ void Document::FinishedParsing() {
+ #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h"
+ #include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
+ #include "third_party/blink/renderer/core/policy/document_policy.h"
+@@ -5848,17 +5849,25 @@ void Document::FinishedParsing() {
 
   // determine whether this is a Google search results page
   const SecurityOrigin *origin = GetSecurityOrigin();
@@ -63,10 +63,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
 }
 
 void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h b/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+diff --git a/third_party/blink/renderer/core/dom/extensions/video_bg_play.h b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h
 new file mode 100644
 --- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+++ b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h
@@ -0,0 +1,6 @@
 +#ifndef video_bg_play_h
 +#define video_bg_play_h
@@ -0,0 +1,52 @@
+From: AlexeyBarabash <alexey@brave.com>
+Date: Thu, 2 Nov 2017 18:21:16 +0200
+Subject: Allow playing audio in background
+
+---
+ media/blink/webmediaplayer_impl.cc | 11 ++++++++++-
+ media/blink/webmediaplayer_impl.h  |  2 ++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+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
+@@ -853,6 +853,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+   return pipeline_metadata_.has_audio;
+ }
+ 
+bool WebMediaPlayerImpl::HasVideoNonEmptySize() const {
+  DCHECK(main_task_runner_->BelongsToCurrentThread());
+
+  return pipeline_metadata_.has_video && pipeline_metadata_.natural_size.width() != 0 && pipeline_metadata_.natural_size.height() != 0;
+}
+
+ void WebMediaPlayerImpl::EnabledAudioTracksChanged(
+     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
+   DCHECK(main_task_runner_->BelongsToCurrentThread());
+@@ -2877,7 +2883,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 (IsBackgroundedSuspendEnabled()) {
+-    if (!HasVideo())
+    //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
+    //see media/base/pipeline_metadata.h. This is a workaround to allow audio
+    //streams be played in background.
+    if (!HasVideoNonEmptySize())
+       return false;
+ 
+ #if defined(OS_ANDROID)
+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
+@@ -155,6 +155,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;
+  // True is has video and it's frame size is not zero
+  bool HasVideoNonEmptySize() const;
+ 
+   void EnabledAudioTracksChanged(
+       const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
+-- 
+2.7.4
+
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 12 Jun 2018 15:18:19 +0200
+Subject: Use Android MediaPlayer for URLs
+
+---
+ content/public/renderer/content_renderer_client.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
+--- a/content/public/renderer/content_renderer_client.cc
+++ b/content/public/renderer/content_renderer_client.cc
+@@ -121,7 +121,7 @@ bool ContentRendererClient::HandleNavigation(
+ }
+ 
+ bool ContentRendererClient::ShouldUseMediaPlayerForURL(const GURL& url) {
+-  return false;
+  return true;
+ }
+ #endif
+ 
+-- 
+2.7.4
+
@@ -0,0 +1,28 @@
+From: AlexeyBarabash <alexey@brave.com>
+Date: Thu, 11 Jan 2018 13:27:34 +0200
+Subject: Open YouTube links in Bromite
+
+---
+ .../chrome/browser/externalnav/ExternalNavigationHandler.java      | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+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
+@@ -357,6 +357,13 @@ public class ExternalNavigationHandler {
+             return OverrideUrlLoadingResult.NO_OVERRIDE;
+         }
+ 
+        // Force to open YouTube urls in Bromite
+        String intentPackageName = intent.getPackage();
+        if (intentPackageName != null && intentPackageName.equals("com.google.android.youtube")) {
+            if (DEBUG) Log.i(TAG, "NO_OVERRIDE: YouTube URL for YouTube app");
+            return OverrideUrlLoadingResult.NO_OVERRIDE;
+        }
+
+         // Sanitize the Intent, ensuring web pages can not bypass browser
+         // security (only access to BROWSABLE activities).
+         intent.addCategory(Intent.CATEGORY_BROWSABLE);
+-- 
+2.7.4
+
@@ -1,36 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 2 Apr 2018 11:36:02 +0200
-Subject: Punt the Widevine version string
-
-Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.beta/view/head:/debian/patches/fix_building_widevinecdm_with_chromium.patch
---
- chrome/common/chrome_content_client.cc | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-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
-@@ -238,10 +238,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
-     info.is_out_of_process = true;
-     info.path = adapter_path;
-     info.name = kWidevineCdmDisplayName;
-    info.description =
-        base::StringPrintf("%s (version: " WIDEVINE_CDM_VERSION_STRING ")",
-                           kWidevineCdmDescription);
-    info.version = WIDEVINE_CDM_VERSION_STRING;
-+    info.description = kWidevineCdmDescription;
-     info.permissions = kWidevineCdmPluginPermissions;
- 
-     content::WebPluginMimeType mime_type(kWidevineCdmPluginMimeType,
-@@ -566,7 +563,7 @@ void ChromeContentClient::AddContentDecryptionModules(
-       // CdmInfo needs |path| to be the actual Widevine library,
-       // not the adapter, so adjust as necessary. It will be in the
-       // same directory as the installed adapter.
-      const base::Version version(WIDEVINE_CDM_VERSION_STRING);
-+      const base::Version version("1.0.123.456");
-       DCHECK(version.IsValid());
- 
-       cdms->push_back(content::CdmInfo(
-- 
-2.7.4
-
@@ -14,7 +14,7 @@ Subject: url_request: hooks and ad url data
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1748,6 +1748,8 @@ component("net") {
+@@ -1756,6 +1756,8 @@ component("net") {
       "url_request/url_fetcher_response_writer.h",
       "url_request/url_range_request_job.cc",
       "url_request/url_range_request_job.h",
@@ -166,7 +166,7 @@ new file mode 100644
 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 --- a/net/url_request/url_request.cc
 +++ b/net/url_request/url_request.cc
-@@ -43,6 +43,8 @@
+@@ -44,6 +44,8 @@
 #include "url/gurl.h"
 #include "url/origin.h"
 
@@ -175,7 +175,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 #if BUILDFLAG(ENABLE_REPORTING)
 #include "net/network_error_logging/network_error_logging_service.h"
 #include "net/reporting/reporting_service.h"
-@@ -581,6 +583,8 @@ URLRequest::URLRequest(const GURL& url,
+@@ -583,6 +585,8 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -22,7 +22,7 @@ Re-land: third-party filters support
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1748,8 +1748,6 @@ component("net") {
+@@ -1756,8 +1756,6 @@ component("net") {
       "url_request/url_fetcher_response_writer.h",
       "url_request/url_range_request_job.cc",
       "url_request/url_range_request_job.h",
@@ -31,7 +31,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
       "url_request/url_request.cc",
       "url_request/url_request.h",
       "url_request/url_request_context.cc",
-@@ -1810,6 +1808,13 @@ component("net") {
+@@ -1815,6 +1813,13 @@ component("net") {
       "//third_party/zlib",
     ]
 
@@ -538,7 +538,7 @@ deleted file mode 100644
 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 --- a/net/url_request/url_request.cc
 +++ b/net/url_request/url_request.cc
-@@ -43,7 +43,9 @@
+@@ -44,7 +44,9 @@
 #include "url/gurl.h"
 #include "url/origin.h"
 
@@ -549,17 +549,17 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 
 #if BUILDFLAG(ENABLE_REPORTING)
 #include "net/network_error_logging/network_error_logging_service.h"
-@@ -558,7 +560,9 @@ URLRequest::URLRequest(const GURL& url,
+@@ -559,7 +561,9 @@ URLRequest::URLRequest(const GURL& url,
                                          : context->network_delegate()),
       net_log_(NetLogWithSource::Make(context->net_log(),
                                       NetLogSourceType::URL_REQUEST)),
 +#if !defined(OS_ANDROID)
       url_chain_(1, url),
 +#endif
+       attach_same_site_cookies_(false),
       method_("GET"),
       referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE),
-       first_party_url_policy_(NEVER_CHANGE_FIRST_PARTY_URL),
-@@ -583,7 +587,18 @@ URLRequest::URLRequest(const GURL& url,
+@@ -585,7 +589,18 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -1,22 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 28 Apr 2018 08:30:26 +0200
-Subject: Enable DNS-over-HTTPS by default
-
---
- components/network_session_configurator/common/network_features.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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,6 +10,6 @@ const base::Feature kTokenBinding{"token-binding",
-                                   base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kDnsOverHttps{"dns-over-https",
-                                  base::FEATURE_DISABLED_BY_DEFAULT};
-+                                  base::FEATURE_ENABLED_BY_DEFAULT};
- 
- }  // namespace features
-- 
-2.7.4
-
@@ -4,7 +4,7 @@ Subject: Battery API: return nothing

 ---
 services/device/battery/battery_status_service.cc  |  2 +-
- .../Source/modules/battery/BatteryManager.cpp      | 25 ++++------------------
+ .../renderer/modules/battery/battery_manager.cc    | 25 ++++------------------
 2 files changed, 5 insertions(+), 22 deletions(-)

 diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
@@ -19,9 +19,9 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
   if (callback_list_.empty()) {
     bool success = battery_fetcher_->StartListeningBatteryChange();
     // On failure pass the default values back.
-diff --git a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
--- a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
-+++ b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
+diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
+--- a/third_party/blink/renderer/modules/battery/battery_manager.cc
+++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -42,45 +42,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
 }
 
@@ -3,13 +3,13 @@ Date: Thu, 22 Mar 2018 22:38:00 +0100
 Subject: Disable plugins enumeration

 ---
- third_party/WebKit/Source/core/frame/LocalFrame.cpp | 6 ++----
+ third_party/blink/renderer/core/frame/local_frame.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
-+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
-@@ -1134,10 +1134,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
+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
+@@ -1175,10 +1175,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
 }
 
 PluginData* LocalFrame::GetPluginData() const {
@@ -4,14 +4,14 @@ Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL

 Return fixed base latency
 ---
- third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl | 8 ++++----
- third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl  | 4 ++--
- third_party/WebKit/Source/modules/webaudio/AudioContext.cpp | 2 +-
+ third_party/blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++----
+ third_party/blink/renderer/modules/webaudio/audio_buffer.idl  | 4 ++--
+ third_party/blink/renderer/modules/webaudio/audio_context.cc  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

-diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
--- a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
-+++ b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
+diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
+--- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
+++ b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
@@ -42,10 +42,10 @@ interface AnalyserNode : AudioNode {
 
     // Copies the current frequency data into the passed array.
@@ -27,9 +27,9 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third
 +    //void getFloatTimeDomainData(Float32Array array);
 +    //void getByteTimeDomainData(Uint8Array array);
 };
-diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
--- a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
-+++ b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
+diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
+--- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
+++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
@@ -38,7 +38,7 @@
 
     // Channel access
@@ -40,9 +40,9 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_
 +    //[RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
 };
-diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
--- a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
-+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
+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
@@ -261,7 +261,7 @@ void AudioContext::StopRendering() {
 }
 
@@ -1,67 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 24 Mar 2018 05:18:03 +0100
-Subject: Canvas: fingerprinting mitigations via IDL
-
-Disable toDataURL, toBlob, getImageData and webGL renderering info
---
- third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl      | 4 ++--
- .../Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl       | 4 ++--
- third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp    | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
--- a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
-+++ b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
-@@ -37,9 +37,9 @@ interface HTMLCanvasElement : HTMLElement
-     // Note: The arguments argument is variadic in the spec, but not here as
-     // only one extra argument is actually used.
-     // FIXME: type should not have a default value.
-    [MeasureAs=CanvasToDataURL, RaisesException] DOMString toDataURL(optional DOMString type = null, optional any arguments);
-+    //[MeasureAs=CanvasToDataURL, RaisesException] DOMString toDataURL(optional DOMString type = null, optional any arguments);
- 
-    [MeasureAs=CanvasToBlob, RaisesException] void toBlob(BlobCallback _callback, optional DOMString type = null, optional any arguments);
-+    //[MeasureAs=CanvasToBlob, RaisesException] void toBlob(BlobCallback _callback, optional DOMString type = null, optional any arguments);
- };
- 
- // https://html.spec.whatwg.org/multipage/canvas.html#blobcallback
-diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
--- a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
-+++ b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
-@@ -110,7 +110,7 @@ interface CanvasRenderingContext2D {
-     // text (see also the CanvasDrawingStyles interface)
-     void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
-     void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
-    TextMetrics measureText(DOMString text);
-+    //TextMetrics measureText(DOMString text);
- 
-     // drawing images
-     [CallWith=ScriptState, RaisesException] void drawImage(CanvasImageSource image, unrestricted double x, unrestricted double y);
-@@ -125,7 +125,7 @@ interface CanvasRenderingContext2D {
-     // pixel manipulation
-     [RaisesException] ImageData createImageData(ImageData imagedata);
-     [RaisesException] ImageData createImageData(long sw, long sh);
-    [RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh);
-+    //[RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh);
-     [RaisesException] void putImageData(ImageData imagedata, long dx, long dy);
-     [RaisesException] void putImageData(ImageData imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight);
-     
-diff --git a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
--- a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
-+++ b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
-@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
- 
- WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
-     WebGLRenderingContextBase* context) {
-  return new WebGLDebugRendererInfo(context);
-+  return nullptr;
- }
- 
- bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
-  return true;
-+  return false;
- }
- 
- const char* WebGLDebugRendererInfo::ExtensionName() {
-- 
-2.7.4
-
@@ -13,25 +13,25 @@ used for fingerprinting and sufficient to poison the well.

 See also: http://www.gsd.inesc-id.pt/~mpc/pubs/fingerprinting-trustcom2016.pdf
 ---
- third_party/WebKit/Source/core/dom/Document.cpp | 14 ++++++++++++++
- third_party/WebKit/Source/core/dom/Document.h   |  5 +++++
- third_party/WebKit/Source/core/dom/Element.cpp  |  7 +++++++
- third_party/WebKit/Source/core/dom/Range.cpp    |  8 +++++++-
+ third_party/blink/renderer/core/dom/document.cc | 14 ++++++++++++++
+ third_party/blink/renderer/core/dom/document.h  |  5 +++++
+ third_party/blink/renderer/core/dom/element.cc  |  7 +++++++
+ third_party/blink/renderer/core/dom/range.cc    |  8 +++++++-
 4 files changed, 33 insertions(+), 1 deletion(-)

-diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
--- a/third_party/WebKit/Source/core/dom/Document.cpp
-+++ b/third_party/WebKit/Source/core/dom/Document.cpp
-@@ -272,6 +272,8 @@
- #include "services/service_manager/public/cpp/interface_provider.h"
- #include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom-blink.h"
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -279,6 +279,8 @@
+ 
+ #include "extensions/anti_amp_cure.h"
 
 +#include "base/rand_util.h"
 +
 #ifndef NDEBUG
 using WeakDocumentSet =
     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
-@@ -731,6 +733,10 @@ Document::Document(const DocumentInit& initializer,
+@@ -740,6 +742,10 @@ Document::Document(const DocumentInit& initializer,
 #ifndef NDEBUG
   liveDocumentSet().insert(this);
 #endif
@@ -42,7 +42,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
 }
 
 Document::~Document() {
-@@ -757,6 +763,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
+@@ -766,6 +772,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
                        Position::BeforeNode(*shadow_host));
 }
 
@@ -57,10 +57,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
 SelectorQueryCache& Document::GetSelectorQueryCache() {
   if (!selector_query_cache_)
     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
--- a/third_party/WebKit/Source/core/dom/Document.h
-+++ b/third_party/WebKit/Source/core/dom/Document.h
-@@ -406,6 +406,9 @@ class CORE_EXPORT Document : public ContainerNode,
+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
+@@ -408,6 +408,9 @@ class CORE_EXPORT Document : public ContainerNode,
 
   String origin() const;
 
@@ -70,7 +70,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/
   String visibilityState() const;
   mojom::PageVisibilityState GetPageVisibilityState() const;
   bool hidden() const;
-@@ -1663,6 +1666,8 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1670,6 +1673,8 @@ class CORE_EXPORT Document : public ContainerNode,
 
   double start_time_;
 
@@ -79,10 +79,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/
   TraceWrapperMember<ScriptRunner> script_runner_;
 
   HeapVector<Member<ScriptElementBase>> current_script_stack_;
-diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
--- a/third_party/WebKit/Source/core/dom/Element.cpp
-+++ b/third_party/WebKit/Source/core/dom/Element.cpp
-@@ -1327,6 +1327,11 @@ DOMRectList* Element::getClientRects() {
+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
+@@ -1348,6 +1348,11 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
       quads, *element_layout_object);
@@ -94,7 +94,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit
   return DOMRectList::Create(quads);
 }
 
-@@ -1344,6 +1349,8 @@ DOMRect* Element::getBoundingClientRect() {
+@@ -1365,6 +1370,8 @@ DOMRect* Element::getBoundingClientRect() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                         *element_layout_object);
@@ -103,10 +103,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit
   return DOMRect::FromFloatRect(result);
 }
 
-diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp
--- a/third_party/WebKit/Source/core/dom/Range.cpp
-+++ b/third_party/WebKit/Source/core/dom/Range.cpp
-@@ -1589,11 +1589,17 @@ DOMRectList* Range::getClientRects() const {
+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
+@@ -1575,11 +1575,17 @@ DOMRectList* Range::getClientRects() const {
   Vector<FloatQuad> quads;
   GetBorderAndTextQuads(quads);
 
@@ -0,0 +1,318 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 24 Mar 2018 05:18:03 +0100
+Subject: Canvas: fingerprinting mitigations for image data, font metrics and
+ webGL
+
+Disable webGL renderer info, add shuffling to TextMetrics.
+Additionally, the color data returned by ToBlob, ToDataURL and getImageData
+will contain randomly manipulated pixels (maximum 10) that slightly
+change the color of the R,G,B components without a visible effect.
+
+Credits to Slaviro (https://github.com/Slaviro) for coming up with a better
+approach to change color components.
+---
+ .../renderer/core/html/canvas/text_metrics.cc      |  20 +++
+ .../blink/renderer/core/html/canvas/text_metrics.h |   2 +
+ .../canvas/canvas2d/canvas_rendering_context_2d.cc |   6 +-
+ .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
+ .../platform/graphics/image_data_buffer.cc         |   4 +
+ .../platform/graphics/static_bitmap_image.cc       | 151 +++++++++++++++++++++
+ .../platform/graphics/static_bitmap_image.h        |   2 +
+ 7 files changed, 186 insertions(+), 3 deletions(-)
+
+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
+@@ -47,6 +47,26 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
+   return 0;
+ }
+ 
+void TextMetrics::Shuffle(const double amt) {
+  double adjusted = 1 + amt;
+
+  // x-direction
+  width_ *= adjusted;
+  actual_bounding_box_left_ *= adjusted;
+  actual_bounding_box_right_ *= adjusted;
+
+  // y-direction
+  font_bounding_box_ascent_ *= adjusted;
+  font_bounding_box_descent_ *= adjusted;
+  actual_bounding_box_ascent_ *= adjusted;
+  actual_bounding_box_descent_ *= adjusted;
+  em_height_ascent_ *= adjusted;
+  em_height_descent_ *= adjusted;
+  hanging_baseline_ *= adjusted;
+  alphabetic_baseline_ *= adjusted;
+  ideographic_baseline_ *= adjusted;
+}
+
+ void TextMetrics::Update(const Font& font,
+                          const TextDirection& direction,
+                          const TextBaseline& baseline,
+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
+@@ -67,6 +67,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
+ 
+   static float GetFontBaseline(const TextBaseline&, const FontMetrics&);
+ 
+  void Shuffle(const double amt);
+
+  private:
+   void Update(const Font&,
+               const TextDirection&,
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+@@ -773,8 +773,12 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+   else
+     direction = ToTextDirection(GetState().GetDirection(), canvas());
+ 
+-  return TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
+  TextMetrics* textMetrics = TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
+                              GetState().GetTextAlign(), text);
+
+  textMetrics->Shuffle(canvas()->GetDocument().GetShuffleFactorX());
+
+  return textMetrics;
+ }
+ 
+ void CanvasRenderingContext2D::DrawTextInternal(
+diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
+--- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
+@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
+ 
+ WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
+     WebGLRenderingContextBase* context) {
+-  return new WebGLDebugRendererInfo(context);
+  return nullptr;
+ }
+ 
+ bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
+-  return true;
+  return false;
+ }
+ 
+ const char* WebGLDebugRendererInfo::ExtensionName() {
+diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+@@ -35,6 +35,7 @@
+ #include <memory>
+ 
+ #include "base/memory/ptr_util.h"
+#include "base/rand_util.h"
+ #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
+ #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
+ #include "third_party/blink/renderer/platform/network/mime/mime_type_registry.h"
+@@ -121,6 +122,9 @@ bool ImageDataBuffer::EncodeImage(const String& mime_type,
+                                   Vector<unsigned char>* encoded_image) const {
+   DCHECK(is_valid_);
+ 
+  // shuffle subchannel color data within the pixmap
+  StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
+
+   if (mime_type == "image/jpeg") {
+     SkJpegEncoder::Options options;
+     options.fQuality = ImageEncoder::ComputeJpegQuality(quality);
+diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
+--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
+ 
+#include "base/rand_util.h"
+ #include "gpu/command_buffer/client/gles2_interface.h"
+ #include "skia/ext/texture_handle.h"
+ #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
+@@ -16,6 +17,7 @@
+ #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/gpu/GrContext.h"
+ 
+ namespace blink {
+@@ -149,15 +151,164 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
+       rect.Width(), rect.Height(), color_type, kUnpremul_SkAlphaType,
+       color_params.GetSkColorSpaceForSkSurfaces());
+   sk_sp<SkImage> sk_image = src_image->PaintImageForCurrentFrame().GetSkImage();
+
+   bool read_pixels_successful = sk_image->readPixels(
+       info, result.Data(), info.minRowBytes(), rect.X(), rect.Y());
+   DCHECK(read_pixels_successful ||
+          !sk_image->bounds().intersect(SkIRect::MakeXYWH(
+              rect.X(), rect.Y(), info.width(), info.height())));
+
+  ShuffleSubchannelColorData(result.Data(), info, rect.X(), rect.Y());
+
+   result.Transfer(dest_contents);
+   return true;
+ }
+ 
+// set the component to maximum-delta if it is >= maximum, or add to existing color component (color + delta)
+#define shuffleComponent(color, max, delta) ( (color) >= (max) ? ((max)-(delta)) : ((color)+(delta)) )
+
+#define writable_addr(T, p, stride, x, y) (T*)((const char *)p + y * stride + x * sizeof(T))
+
+void StaticBitmapImage::ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY) {
+  auto w = info.width() - srcX, h = info.height() - srcY;
+
+  // skip tiny images
+  if (w + h <= 16) {
+    return;
+  }
+
+  // generate the first random number here
+  double shuffleX = base::RandDouble();
+
+  // cap maximum pixels to change
+  auto pixels = (w + h) / 128;
+  if (pixels > 10) {
+    pixels = 10;
+  } else if (pixels < 2) {
+    pixels = 2;
+  }
+
+  auto colorType = info.colorType();
+  auto fRowBytes = info.minRowBytes(); // stride
+
+  // second random number (for y/height)
+  double shuffleY = base::RandDouble();
+
+  // calculate random coordinates using bisection
+  auto currentW = w, currentH = h;
+  for(;pixels >= 0; pixels--) {
+    int x = currentW * shuffleX, y = currentH * shuffleY;
+
+    // calculate randomisation amounts for each RGB component
+    auto shuffleR = (uint8_t)base::RandInt(0, 4), shuffleG = (uint8_t)base::RandInt(0, 4), shuffleB = (uint8_t)base::RandInt(0, 4);
+
+    // manipulate pixel data to slightly change the R, G, B components
+    switch (colorType) {
+      case kAlpha_8_SkColorType:
+      {
+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
+         auto r = SkColorGetR(*pixel), g = SkColorGetG(*pixel), b = SkColorGetB(*pixel), a = SkColorGetA(*pixel);
+
+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
+         // alpha is left unchanged
+
+         *pixel = SkColorSetARGB(a, r, g, b);
+      }
+      break;
+      case kGray_8_SkColorType:
+      {
+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
+         *pixel = shuffleComponent(*pixel, UINT8_MAX-1, shuffleB);
+      }
+      break;
+      case kRGB_565_SkColorType:
+      {
+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
+         unsigned    r = SkPacked16ToR32(*pixel);
+         unsigned    g = SkPacked16ToG32(*pixel);
+         unsigned    b = SkPacked16ToB32(*pixel);
+
+         r = shuffleComponent(r, 31, shuffleR);
+         g = shuffleComponent(g, 63, shuffleG);
+         b = shuffleComponent(b, 31, shuffleB);
+
+         unsigned r16 = (r & SK_R16_MASK) << SK_R16_SHIFT;
+         unsigned g16 = (g & SK_G16_MASK) << SK_G16_SHIFT;
+         unsigned b16 = (b & SK_B16_MASK) << SK_B16_SHIFT;
+
+         *pixel = r16 | g16 | b16;
+      }
+      break;
+      case kARGB_4444_SkColorType:
+      {
+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
+         auto a = SkGetPackedA4444(*pixel), r = SkGetPackedR4444(*pixel), g = SkGetPackedG4444(*pixel), b = SkGetPackedB4444(*pixel);
+
+         r = shuffleComponent(r, 15, shuffleR);
+         g = shuffleComponent(g, 15, shuffleG);
+         b = shuffleComponent(b, 15, shuffleB);
+         // alpha is left unchanged
+
+         unsigned a4 = (a & 0xF) << SK_A4444_SHIFT;
+         unsigned r4 = (r & 0xF) << SK_R4444_SHIFT;
+         unsigned g4 = (g & 0xF) << SK_G4444_SHIFT;
+         unsigned b4 = (b & 0xF) << SK_B4444_SHIFT;
+
+         *pixel = r4 | b4 | g4 | a4;
+      }
+      break;
+      case kRGBA_8888_SkColorType:
+      {
+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
+         auto a = SkGetPackedA32(*pixel), r = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), b = SkGetPackedB32(*pixel);
+
+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
+         // alpha is left unchanged
+
+         *pixel = (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
+                  (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
+      }
+      break;
+      case kBGRA_8888_SkColorType:
+      {
+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
+         auto a = SkGetPackedA32(*pixel), b = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), r = SkGetPackedB32(*pixel);
+
+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
+         // alpha is left unchanged
+
+         *pixel = (a << SK_BGRA_A32_SHIFT) | (r << SK_BGRA_R32_SHIFT) |
+                  (g << SK_BGRA_G32_SHIFT) | (b << SK_BGRA_B32_SHIFT);
+      }
+      break;
+      default:
+         // the remaining formats are not expected to be used in Chromium
+         return;
+    }
+
+    // keep bisecting or reset current width/height as needed
+    if (x == 0) {
+       currentW = w;
+    } else {
+       currentW = x;
+    }
+    if (y == 0) {
+       currentH = h;
+    } else {
+       currentH = y;
+    }
+  }
+}
+
+#undef writable_addr
+#undef shuffleComponent
+
+ const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const {
+   static const gpu::SyncToken sync_token;
+   return sync_token;
+diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+@@ -46,6 +46,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
+   static scoped_refptr<StaticBitmapImage> Create(WTF::ArrayBufferContents&,
+                                                  const SkImageInfo&);
+ 
+  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
+
+   bool IsStaticBitmapImage() const override { return true; }
+ 
+   // Methods overridden by all sub-classes
+-- 
+2.7.4
+
@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 2 Apr 2018 11:36:02 +0200
+Subject: Punt the Widevine version string
+
+Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.beta/view/head:/debian/patches/fix_building_widevinecdm_with_chromium.patch
+---
+ chrome/common/chrome_content_client.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -526,7 +526,7 @@ void ChromeContentClient::AddContentDecryptionModules(
+     bool supports_persistent_license = false;
+     if (IsWidevineAvailable(&cdm_path, &video_codecs_supported,
+                             &supports_persistent_license)) {
+-      const base::Version version(WIDEVINE_CDM_VERSION_STRING);
+      const base::Version version("1.0.123.456");
+       DCHECK(version.IsValid());
+ 
+       cdms->push_back(content::CdmInfo(
+-- 
+2.7.4
+
@@ -7,10 +7,10 @@ Subject: Add menu option to toggle global Javascript preference
 chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
 .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
 .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
- .../browser/appmenu/AppMenuPropertiesDelegate.java | 35 ++++++++++++++++++++++
+ .../browser/appmenu/AppMenuPropertiesDelegate.java | 37 ++++++++++++++++++++++
 .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
 .../java/strings/android_chrome_strings.grd        | 11 +++++++
- 7 files changed, 89 insertions(+)
+ 7 files changed, 91 insertions(+)

 diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
 --- a/chrome/android/java/res/menu/custom_tabs_menu.xml
@@ -61,7 +61,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
-@@ -2006,6 +2006,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2054,6 +2054,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
             currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
             RecordUserAction.record("MobileMenuRequestDesktopSite");
@@ -79,7 +79,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
-@@ -1796,6 +1796,14 @@ public class ChromeTabbedActivity
+@@ -1710,6 +1710,14 @@ public class ChromeTabbedActivity
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -97,7 +97,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
-@@ -213,6 +213,8 @@ public class AppMenuPropertiesDelegate {
+@@ -214,6 +214,8 @@ public class AppMenuPropertiesDelegate {
 
             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
 
@@ -106,7 +106,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()));
-@@ -468,4 +470,37 @@ public class AppMenuPropertiesDelegate {
+@@ -469,4 +471,39 @@ public class AppMenuPropertiesDelegate {
 
         return chromeHomeMenuItemFlagEnabled && !sHideChromeHomeMenuItems;
     }
@@ -123,12 +123,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +        MenuItem enableMenuLabel = menu.findItem(R.id.enable_javascript_id);
 +        MenuItem enableMenuCheck = menu.findItem(R.id.enable_javascript_check_id);
 +
-+        // Hide enable javascript on all chrome:// pages and the NTP.
+        // Hide enable javascript on all chrome:// pages except for the NTP.
 +        String url = currentTab.getUrl();
 +        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
 +                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
+        // Also hide enable javascsript on Reader Mode.
+        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
 +
-+        boolean itemVisible = !isChromeScheme && !currentTab.isNativePage();
+        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
 +        enableMenuRow.setVisible(itemVisible);
 +        if (!itemVisible) return;
 +
@@ -147,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -164,6 +164,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -171,6 +171,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
             }
 
             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
@@ -158,7 +160,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
-@@ -2491,6 +2491,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
+@@ -2548,6 +2548,17 @@ Google may use your browsing activity, content on some sites you visit, and othe
       <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>
@@ -0,0 +1,259 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 26 Apr 2018 10:37:05 +0200
+Subject: Add menu option to toggle global Adblock preference
+
+Allow toggling Chromium's "ads enabled" content settings option together with Bromite adblock engine.
+---
+ chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 +++++++
+ chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
+ .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
+ .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
+ .../browser/appmenu/AppMenuPropertiesDelegate.java | 38 ++++++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java        |  2 ++
+ .../java/strings/android_chrome_strings.grd        | 11 +++++++
+ .../subresource_filter_content_settings_manager.cc |  3 ++
+ net/url_request/adblock_intercept.cc               |  2 ++
+ net/url_request/adblock_intercept.h                |  2 ++
+ net/url_request/url_request.cc                     |  4 +++
+ 11 files changed, 103 insertions(+)
+
+diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
+--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
+@@ -74,6 +74,18 @@
+           </menu>
+         </item>
+ 
+        <item android:id="@+id/enable_adblock_row_menu_id"
+            android:title="@null"
+            android:orderInCategory="2">
+          <menu>
+              <item android:id="@+id/enable_adblock_id"
+                  android:title="@string/menu_enable_adblock" />
+              <item android:id="@+id/enable_adblock_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <!-- Title is intentionally left blank in xml and will be set in java. -->
+         <item android:id="@+id/open_in_browser_id"
+             android:title=""
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -82,6 +82,19 @@
+                 android:checkable="true" />
+           </menu>
+         </item>
+
+        <item android:id="@+id/enable_adblock_row_menu_id"
+            android:title="@null"
+            android:orderInCategory="2">
+          <menu>
+              <item android:id="@+id/enable_adblock_id"
+                  android:title="@string/menu_enable_adblock" />
+              <item android:id="@+id/enable_adblock_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <item android:id="@+id/reader_mode_prefs_id"
+             android:title="@string/menu_reader_mode_prefs"
+             android:icon="@drawable/reader_mode_prefs_icon" />
+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
+@@ -2064,6 +2064,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             RecordUserAction.record("MobileMenuRequestEnableJavascript");
+         } else if (id == R.id.reader_mode_prefs_id) {
+             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
+        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
+            final boolean reloadOnChange = !currentTab.isNativePage();
+            final boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
+            PrefServiceBridge.getInstance().setAllowAdsEnabled(adBlockEnabled);
+            if (reloadOnChange) {
+                currentTab.reload();
+            }
+            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
+         } else {
+             return false;
+         }
+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
+@@ -1724,6 +1724,14 @@ public class ChromeTabbedActivity
+             RecordUserAction.record("MobileTabClosedUndoShortCut");
+         } else if (id == R.id.enter_vr_id) {
+             VrShellDelegate.enterVrIfNecessary();
+        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
+            final boolean reloadOnChange = !currentTab.isNativePage();
+            final boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
+            PrefServiceBridge.getInstance().setAllowAdsEnabled(adBlockEnabled);
+            if (reloadOnChange) {
+               currentTab.reload();
+            }
+            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
+         } else {
+             return super.onMenuOrKeyboardAction(id, fromMenu);
+         }
+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
+@@ -212,6 +212,8 @@ public class AppMenuPropertiesDelegate {
+                     && !TextUtils.isEmpty(url);
+             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
+ 
+            updateEnableAdBlockMenuItem(menu, currentTab);
+
+             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
+ 
+             updateEnableJavascriptMenuItem(menu, currentTab);
+@@ -445,6 +447,42 @@ public class AppMenuPropertiesDelegate {
+     }
+ 
+     /**
+     * Updates the enable AdBlock item's state.
+     *
+     * @param menu {@link Menu} for enable adblock
+     * @param currentTab      Current tab being displayed.
+     */
+    protected void updateEnableAdBlockMenuItem(
+            Menu menu, Tab currentTab) {
+        MenuItem enableMenuRow = menu.findItem(R.id.enable_adblock_row_menu_id);
+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_adblock_id);
+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_adblock_check_id);
+
+
+        // Hide enable adblock on all chrome:// pages except for the NTP.
+        String url = currentTab.getUrl();
+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
+        // Also hide enable javascsript on Reader Mode.
+        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
+
+        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
+        enableMenuRow.setVisible(itemVisible);
+        if (!itemVisible) return;
+
+        boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
+
+        // Mark the checkbox if adblock is globally activate.
+        enableMenuCheck.setChecked(adBlockEnabled);
+
+        // This title doesn't seem to be displayed by Android, but it is used to set up
+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
+        enableMenuLabel.setTitleCondensed(adBlockEnabled
+                        ? mActivity.getString(R.string.menu_enable_adblock_on)
+                        : mActivity.getString(R.string.menu_enable_adblock_off));
+    }
+
+    /**
+      * @return Whether bookmarks, downloads, and history should be shown in the menu.
+      */
+     public static boolean shouldShowNavMenuItems() {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+@@ -170,6 +170,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+                 }
+             }
+ 
+            updateEnableAdBlockMenuItem(menu, currentTab);
+
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
+             updateEnableJavascriptMenuItem(menu, currentTab);
+             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+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
+@@ -2568,6 +2568,17 @@ Google may use your browsing activity, content on some sites you visit, and othe
+       <message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
+         Turn on Request desktop site
+       </message>
+
+      <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable AdBlock engine for the page. [CHAR-LIMIT=27]">
+        Enable AdBlock
+      </message>
+      <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Enable AdBlock is selected.">
+        Turn off AdBlock
+      </message>
+      <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Enable AdBlock is unselected.">
+        Turn on AdBlock
+      </message>
+
+       <message name="IDS_MENU_READER_MODE_PREFS" desc="Menu item to show reader mode preferences pane, which allows users to change the appearance (font size, theme, etc.) of the page. [CHAR-LIMIT=27]">
+         Appearance
+       </message>
+diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
+--- a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
+@@ -22,6 +22,7 @@
+ #include "components/keyed_service/core/service_access_type.h"
+ #include "components/subresource_filter/core/browser/subresource_filter_features.h"
+ #include "url/gurl.h"
+#include "net/url_request/adblock_intercept.h"
+ 
+ namespace {
+ 
+@@ -160,9 +161,11 @@ void SubresourceFilterContentSettingsManager::OnContentSettingChanged(
+     if (global_setting == CONTENT_SETTING_ALLOW) {
+       ChromeSubresourceFilterClient::LogAction(
+           kActionContentSettingsAllowedGlobal);
+      net::adblock_enabled = false;
+     } else if (global_setting == CONTENT_SETTING_BLOCK) {
+       ChromeSubresourceFilterClient::LogAction(
+           kActionContentSettingsBlockedGlobal);
+      net::adblock_enabled = true;
+     } else {
+       NOTREACHED();
+     }
+diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
+--- a/net/url_request/adblock_intercept.cc
+++ b/net/url_request/adblock_intercept.cc
+@@ -19,6 +19,8 @@
+ 
+ namespace net {
+ 
+bool adblock_enabled = true;
+
+ const char *LOG_TAG = "Bromite";
+ 
+ #ifdef ADB_TESTER
+diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_intercept.h
+--- a/net/url_request/adblock_intercept.h
+++ b/net/url_request/adblock_intercept.h
+@@ -11,6 +11,8 @@ int adblock_rules_count();
+ 
+ int adblock_intercept(const GURL &url, const std::string &origin_host);
+ 
+extern bool adblock_enabled;
+
+ } // namespace net
+ 
+ #endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
+diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
+--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
+@@ -590,6 +590,7 @@ URLRequest::URLRequest(const GURL& url,
+   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
+ 
+ #if defined(OS_ANDROID)
+  if (net::adblock_enabled) {
+   std::string initiatorHost;
+   if (initiator_.has_value()) {
+     initiatorHost = initiator_.value().host();
+@@ -600,6 +601,9 @@ URLRequest::URLRequest(const GURL& url,
+   } else {
+      url_chain_ = { url };
+   }
+  } else {
+     url_chain_ = { url };
+  }
+ #endif
+ 
+   context->url_requests()->insert(this);
+-- 
+2.7.4
+
@@ -10,9 +10,9 @@ Subject: Remove google 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
-@@ -726,8 +726,7 @@ android_assets("chrome_public_locale_pak_assets") {
- jinja_template_resources("chrome_public_apk_template_resources") {
+@@ -784,8 +784,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
   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",
@@ -23,7 +23,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
-@@ -822,14 +822,14 @@ by a child template that "extends" this file.
+@@ -804,14 +804,14 @@ by a child template that "extends" this file.
         </provider>
 
         <!-- Sync adapter for browser invalidation. -->
@@ -9,7 +9,7 @@ Subject: Disable metrics on all I/O threads
 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
-@@ -971,7 +971,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
+@@ -964,7 +964,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
 
 bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -0,0 +1,282 @@
+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 +++
+ chrome/browser/io_thread.cc                        | 14 +++++++----
+ .../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            | 28 +++++++++++++--------
+ 10 files changed, 64 insertions(+), 45 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
+@@ -395,6 +395,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[] = {
+@@ -3544,6 +3550,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
+@@ -1849,6 +1849,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
+@@ -1133,6 +1133,9 @@ extern const char kAndroidPaymentAppsDescription[];
+ 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/io_thread.cc b/chrome/browser/io_thread.cc
+--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
+@@ -53,6 +53,7 @@
+ #include "components/metrics/metrics_service.h"
+ #include "components/net_log/chrome_net_log.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_service.h"
+ #include "components/policy/policy_constants.h"
+ #include "components/prefs/pref_registry_simple.h"
+@@ -383,13 +384,16 @@ IOThread::IOThread(
+                                       base::Unretained(this)));
+   dns_client_enabled_.MoveToThread(io_thread_proxy);
+ 
+-  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
+  std::string dnsOverHttpsServer =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+      switches::kDnsOverHttpsServer);
+  if (!dnsOverHttpsServer.empty()) {
+     base::Value specs(base::Value::Type::LIST);
+     base::Value methods(base::Value::Type::LIST);
+-    base::Value spec(variations::GetVariationParamValueByFeature(
+-        features::kDnsOverHttps, "server"));
+-    base::Value method(variations::GetVariationParamValueByFeature(
+-        features::kDnsOverHttps, "method"));
+
+    base::Value spec(dnsOverHttpsServer);
+    base::Value method("POST");
+
+     if (spec.GetString().size() > 0) {
+       specs.GetList().push_back(std::move(spec));
+       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
+@@ -9,7 +9,8 @@ namespace features {
+ const base::Feature kTokenBinding{"token-binding",
+                                   base::FEATURE_DISABLED_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
+@@ -14,9 +14,10 @@ namespace features {
+ // (https://www.ietf.org/id/draft-ietf-tokbind-protocol-04.txt).
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
+ 
+-// 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,3 +92,9 @@ LOAD_FLAG(DISABLE_CONNECTION_MIGRATION, 1 << 16)
+ // Indicates that the cache should not check that the request matches the
+ // response's vary header.
+ LOAD_FLAG(SKIP_VARY_CHECK, 1 << 17)
+
+// 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)
+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
+@@ -391,30 +391,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) {
+@@ -432,6 +410,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);
+   }
+ 
+@@ -851,7 +830,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,19 +434,23 @@ 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,
+-                                          referrer.spec());
+  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();
+ 
+-  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();
+@@ -663,10 +667,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;
+        }
+       }
+     }
+ 
+@@ -683,7 +689,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
+
@@ -0,0 +1,46 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 5 Jun 2018 13:46:40 +0200
+Subject: Always respect async dns flag (regardless of SDK version)
+
+Do not read experiment value for cronet async DNS configuration
+---
+ chrome/browser/io_thread.cc                     | 10 +---------
+ components/cronet/url_request_context_config.cc |  3 ++-
+ 2 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
+--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
+@@ -258,15 +258,7 @@ void UpdateMetricsUsagePrefsOnUIThread(const std::string& service_name,
+ // Check the AsyncDns field trial and return true if it should be enabled. On
+ // Android this includes checking the Android version in the field trial.
+ bool ShouldEnableAsyncDns() {
+-  bool feature_can_be_enabled = true;
+-#if defined(OS_ANDROID)
+-  int min_sdk =
+-      base::GetFieldTrialParamByFeatureAsInt(features::kAsyncDns, "min_sdk", 0);
+-  if (base::android::BuildInfo::GetInstance()->sdk_int() < min_sdk)
+-    feature_can_be_enabled = false;
+-#endif
+-  return feature_can_be_enabled &&
+-         base::FeatureList::IsEnabled(features::kAsyncDns);
+  return base::FeatureList::IsEnabled(features::kAsyncDns);
+ }
+ 
+ }  // namespace
+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
+@@ -398,7 +398,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+         effective_experimental_options->Remove(it.key(), nullptr);
+         continue;
+       }
+-      async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
+      bool ignored;
+      async_dns_args->GetBoolean(kAsyncDnsEnable, &ignored);
+     } else if (it.key() == kStaleDnsFieldTrialName) {
+       const base::DictionaryValue* stale_dns_args = nullptr;
+       if (!it.value().GetAsDictionary(&stale_dns_args)) {
+-- 
+2.7.4
+
@@ -0,0 +1,37 @@
+From: samartnik <artem@brave.com>
+Date: Thu, 14 Dec 2017 16:19:50 +0200
+Subject: Always allow partner customisation
+
+---
+ .../PartnerBrowserCustomizations.java                    | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+@@ -243,14 +243,14 @@ public class PartnerBrowserCustomizations {
+             @Override
+             protected Void doInBackground(Void... params) {
+                 try {
+-                    boolean systemOrPreStable =
+-                            (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
+-                            || !ChromeVersionInfo.isStableBuild();
+-                    if (!systemOrPreStable) {
+-                        // Only allow partner customization if this browser is a system package, or
+-                        // is in pre-stable channels.
+-                        return null;
+-                    }
+                    //boolean systemOrPreStable =
+                    //        (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
+                    //        || !ChromeVersionInfo.isStableBuild();
+                    //if (!systemOrPreStable) {
+                    //    // Only allow partner customization if this browser is a system package, or
+                    //    // is in pre-stable channels.
+                    //    return null;
+                    //}
+ 
+                     if (isCancelled()) return null;
+                     refreshIncognitoModeDisabled();
+-- 
+2.7.4
+
@@ -0,0 +1,267 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 2 May 2018 01:24:39 +0200
+Subject: Add Always Incognito option
+
+---
+ chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 ++++++++
+ chrome/android/java/res/menu/main_menu.xml         | 12 ++++++++
+ .../chromium/chrome/browser/ChromeActivity.java    |  4 +++
+ .../chrome/browser/ChromeTabbedActivity.java       |  4 +++
+ .../org/chromium/chrome/browser/IntentHandler.java |  8 ++---
+ .../chrome/browser/LaunchIntentDispatcher.java     |  7 +++++
+ .../browser/appmenu/AppMenuPropertiesDelegate.java | 35 ++++++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java        |  2 ++
+ .../browser/preferences/PrefServiceBridge.java     | 17 +++++++++++
+ .../java/strings/android_chrome_strings.grd        | 10 +++++++
+ 10 files changed, 106 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
+--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
+@@ -62,6 +62,18 @@
+           </menu>
+         </item>
+ 
+        <item android:id="@+id/enable_always_incognito_row_menu_id"
+            android:title="@null"
+            android:orderInCategory="2">
+          <menu>
+              <item android:id="@+id/enable_always_incognito_id"
+                  android:title="@string/menu_enable_always_incognito" />
+              <item android:id="@+id/enable_always_incognito_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <item android:id="@+id/request_desktop_site_row_menu_id"
+             android:title="@null"
+             android:orderInCategory="2">
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -72,6 +72,18 @@
+           </menu>
+         </item>
+ 
+        <item android:id="@+id/enable_always_incognito_row_menu_id"
+            android:title="@null"
+            android:orderInCategory="2">
+          <menu>
+              <item android:id="@+id/enable_always_incognito_id"
+                  android:title="@string/menu_enable_always_incognito" />
+              <item android:id="@+id/enable_always_incognito_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <item android:id="@+id/request_desktop_site_row_menu_id"
+             android:title="@null">
+           <menu>
+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
+@@ -1905,6 +1905,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             RecordUserAction.record("MobileMenuSettings");
+         } else if (id == R.id.show_menu) {
+             showAppMenuForKeyboardEvent();
+        } else if (id == R.id.enable_always_incognito_id || id == R.id.enable_always_incognito_check_id) {
+            final boolean alwaysIncognito = PrefServiceBridge.getInstance().alwaysIncognitoEnabled();
+            PrefServiceBridge.getInstance().setAlwaysIncognitoEnabled(!alwaysIncognito);
+            RecordUserAction.record("MobileMenuRequestEnableAlwaysIncognito");
+         } else if (id == R.id.find_in_page_id) {
+             if (mFindToolbarManager == null) return false;
+ 
+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
+@@ -1753,6 +1753,10 @@ public class ChromeTabbedActivity
+                 reportNewTabShortcutUsed(true);
+                 getTabCreator(true).launchNTP();
+             }
+        } else if (id == R.id.enable_always_incognito_id || id == R.id.enable_always_incognito_check_id) {
+            final boolean alwaysIncognito = PrefServiceBridge.getInstance().alwaysIncognitoEnabled();
+            PrefServiceBridge.getInstance().setAlwaysIncognitoEnabled(!alwaysIncognito);
+            RecordUserAction.record("MobileMenuRequestEnableAlwaysIncognito");
+         } else if (id == R.id.all_bookmarks_menu_id) {
+             if (currentTab != null) {
+                 getCompositorViewHolder().hideKeyboard(() -> {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+@@ -732,7 +732,6 @@ public class IntentHandler {
+             // Determine if this intent came from a trustworthy source (either Chrome or Google
+             // first party applications).
+             boolean isInternal = isIntentChromeOrFirstParty(intent);
+-            boolean isFromChrome = wasIntentSenderChrome(intent);
+ 
+             // "Open new incognito tab" is currently limited to Chrome.
+             //
+@@ -741,11 +740,10 @@ public class IntentHandler {
+             // from the list.  In this case, we do not apply our Chrome token as the user has the
+             // option to select apps outside of our control, so we rely on this in memory check
+             // instead.
+-            if (!isFromChrome
+-                    && IntentUtils.safeGetBooleanExtra(
+            if (IntentUtils.safeGetBooleanExtra(
+                             intent, EXTRA_OPEN_NEW_INCOGNITO_TAB, false)
+-                    && (getPendingIncognitoUrl() == null
+-                            || !getPendingIncognitoUrl().equals(intent.getDataString()))) {
+                    && getPendingIncognitoUrl() != null
+                            && getPendingIncognitoUrl().equals(intent.getDataString())) {
+                 return true;
+             }
+ 
+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
+@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
+ import org.chromium.chrome.browser.metrics.MediaNotificationUma;
+ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
+import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+ import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
+ import org.chromium.chrome.browser.searchwidget.SearchActivity;
+ import org.chromium.chrome.browser.tab.Tab;
+@@ -185,6 +186,12 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+         boolean incognito =
+                 mIntent.getBooleanExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, false);
+ 
+        if (!incognito) {
+                incognito = PrefServiceBridge.getInstance().alwaysIncognitoEnabled();
+                if (incognito) {
+                       mIntent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);
+                }
+        }
+         // Check if a web search Intent is being handled.
+         IntentHandler intentHandler = new IntentHandler(this, mActivity.getPackageName());
+         String url = IntentHandler.getUrlFromIntent(mIntent);
+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
+@@ -211,6 +211,8 @@ public class AppMenuPropertiesDelegate {
+                     && !TextUtils.isEmpty(url);
+             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
+ 
+            updateEnableAlwaysIncognitoMenuItem(menu, currentTab);
+
+             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
+ 
+             updateEnableJavascriptMenuItem(menu, currentTab);
+@@ -410,6 +412,39 @@ public class AppMenuPropertiesDelegate {
+     }
+ 
+     /**
+     * Updates the enable Always Incognito item's state.
+     *
+     * @param menu {@link Menu} for enable always incognito
+     * @param currentTab      Current tab being displayed.
+     */
+    protected void updateEnableAlwaysIncognitoMenuItem(
+            Menu menu, Tab currentTab) {
+        MenuItem enableMenuRow = menu.findItem(R.id.enable_always_incognito_row_menu_id);
+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_always_incognito_id);
+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_always_incognito_check_id);
+
+        // Hide enable always incognito on all chrome:// pages and the NTP.
+        String url = currentTab.getUrl();
+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
+
+        boolean itemVisible = !isChromeScheme && !currentTab.isNativePage();
+        enableMenuRow.setVisible(itemVisible);
+        if (!itemVisible) return;
+
+        boolean alwaysIncognito = PrefServiceBridge.getInstance().alwaysIncognitoEnabled();
+
+        // Mark the checkbox if always incognito is activated on this tab.
+        enableMenuCheck.setChecked(alwaysIncognito);
+
+        // This title doesn't seem to be displayed by Android, but it is used to set up
+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
+        enableMenuLabel.setTitleCondensed(alwaysIncognito
+                        ? mActivity.getString(R.string.menu_enable_always_incognito_on)
+                        : mActivity.getString(R.string.menu_enable_always_incognito_off));
+    }
+
+    /**
+      * Updates the request desktop site item's state.
+      *
+      * @param menu {@link Menu} for request desktop site.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+@@ -163,6 +163,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+                 }
+             }
+ 
+            updateEnableAlwaysIncognitoMenuItem(menu, currentTab);
+
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
+             updateEnableJavascriptMenuItem(menu, currentTab);
+             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+@@ -57,6 +57,8 @@ public class PrefServiceBridge {
+     private static final String CONTEXTUAL_SEARCH_DISABLED = "false";
+     private static final String CONTEXTUAL_SEARCH_ENABLED = "true";
+ 
+    private static boolean alwaysIncognito = false;
+
+     /**
+      * Structure that holds all the version information about the current Chrome browser.
+      */
+@@ -359,6 +361,14 @@ public class PrefServiceBridge {
+     }
+ 
+     /**
+     * @return true if always-incognito is enabled.
+     * The default is false.
+     */
+    public boolean alwaysIncognitoEnabled() {
+        return alwaysIncognito;
+    }
+
+    /**
+      * @return true if background sync is managed by policy.
+      */
+     public boolean isBackgroundSyncManaged() {
+@@ -422,6 +432,13 @@ public class PrefServiceBridge {
+     }
+ 
+     /**
+     * Enable or disable always-incognito mode.
+     */
+    public void setAlwaysIncognitoEnabled(boolean enabled) {
+        alwaysIncognito = enabled;
+    }
+
+    /**
+      * Enable or disable background sync.
+      */
+     public void setBackgroundSyncEnabled(boolean enabled) {
+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
+@@ -2502,6 +2502,16 @@ To obtain new licenses, connect to the internet and play your downloaded content
+         Turn on JavaScript
+       </message>
+ 
+      <message name="IDS_MENU_ENABLE_ALWAYS_INCOGNITO" desc="Menu item in Chrome's overflow/options menu. If this menu item is selected, Bromite will always open new pages in incognito mode. [CHAR-LIMIT=27]">
+        Always Incognito
+      </message>
+      <message name="IDS_MENU_ENABLE_ALWAYS_INCOGNITO_ON" desc="Accessibility description for when Always Incognito is selected.">
+        Turn off Always Incognito
+      </message>
+      <message name="IDS_MENU_ENABLE_ALWAYS_INCOGNITO_OFF" desc="Accessibility description for when Enable Always Incognito is unselected.">
+        Turn on Always Incognito
+      </message>
+
+       <message name="IDS_MENU_REQUEST_DESKTOP_SITE" desc="Menu item in Chrome's overflow/options menu. By default, when a user navigates to a web page, Chrome shows the mobile site, that is, the version of the site designed for mobile phones. If this menu item is selected, however, Chrome will try to load the 'desktop' site instead, i.e. the site designed for desktop computers or laptop computers, which have larger screens. [CHAR-LIMIT=24]">
+         Desktop site
+       </message>
+-- 
+2.7.4
+
@@ -0,0 +1,974 @@
+commit 56ab68688e7d2c7734e6190bf602dd584eae3222
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sat Dec 9 23:03:50 2017 +0100
+
+    Incognito-only mode ported from CAF
+    Some rework was needed, almost nothing applied cleanly.
+    See below for the description of the two commits that were merged in this one.
+    
+        Browser setting to switch to incognito only mode
+    
+        - Added a setting to switch to incognito only mode in
+          privacy settings
+        - Upon enabling or disabling the switch, the browser will
+          restart in the respective mode (regular or incognito only)
+    
+        Change-Id: Ic42daa3e9bfdc0fcb4029d9df16ed57c5776d966
+    
+        Fix issues seen in full incognito mode
+    
+        - Fixes crashes seen in incognito mode.
+        - Allow Custom Tabs, Web Apps to use the incognito only mode.
+        - Ensure we notify the user of the incognito mode in the notification bar and remove the notification when all
+          incognito tabs are closed.
+        - Ensure the status bar for Custom Tabs and Web Apps are grey to give a visual notification to use.
+        - Ensure the tabs are correctly ref counted for Custom Tabs, Web Apps when using incognito only mode.
+    
+        CR-Fixed: SWE-8867, SWE-8802
+    
+        Change-Id: I95a77016e7562d82359c7780771da4c7bb73aa06
+
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+index ce7db92..a85aea3 100644
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -31,6 +31,10 @@
+         android:title="@string/network_predictions_title"
+         android:summary="@string/network_predictions_summary"
+         android:persistent="false" />
+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+        android:key="incognito_only"
+        android:title="@string/incognito_only_title"
+        android:summary="@string/incognito_only_summary" />
+     <Preference
+         android:key="usage_and_crash_reports"
+         android:title="@string/usage_and_crash_reports_title"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+index 49a3251..7445c9b 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -51,6 +51,9 @@ import org.chromium.base.VisibleForTesting;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.chrome.R;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+import org.chromium.chrome.browser.init.AsyncInitializationActivity;
+import org.chromium.chrome.browser.preferences.AboutChromePreferences;
+ import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
+ import org.chromium.chrome.browser.IntentHandler.TabOpenType;
+ import org.chromium.chrome.browser.appmenu.AppMenu;
+@@ -84,6 +87,7 @@ import org.chromium.chrome.browser.gsa.GSAAccountChangeListener;
+ import org.chromium.chrome.browser.gsa.GSAState;
+ import org.chromium.chrome.browser.help.HelpAndFeedback;
+ import org.chromium.chrome.browser.history.HistoryManagerUtils;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.infobar.InfoBarContainer;
+ import org.chromium.chrome.browser.init.AsyncInitializationActivity;
+ import org.chromium.chrome.browser.init.ProcessInitializationHandler;
+@@ -130,6 +134,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarManager;
+ import org.chromium.chrome.browser.util.AccessibilityUtil;
+ import org.chromium.chrome.browser.util.ColorUtils;
+ import org.chromium.chrome.browser.util.FeatureUtilities;
+
+ import org.chromium.chrome.browser.vr_shell.VrIntentUtils;
+ import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
+ import org.chromium.chrome.browser.webapps.AddToHomescreenManager;
+@@ -1312,6 +1317,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+      * @param menu Menu that is going to be shown when the menu button is pressed.
+      */
+     public void prepareMenu(Menu menu) {
+        if (IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()) {
+            menu.findItem(R.id.new_incognito_tab_menu_id).setVisible(false);
+        }
+     }
+ 
+     protected IntentHandlerDelegate createIntentHandlerDelegate() {
+@@ -1436,7 +1444,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             throw new IllegalStateException(
+                     "Attempting to access TabCreator before initialization");
+         }
+-        return incognito ? mIncognitoTabCreator : mRegularTabCreator;
+        return incognito || IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()
+                ? mIncognitoTabCreator : mRegularTabCreator;
+     }
+ 
+     /**
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SingleTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/SingleTabActivity.java
+index 44c9c8a..bcba76a 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/SingleTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/SingleTabActivity.java
+@@ -4,15 +4,28 @@
+ 
+ package org.chromium.chrome.browser;
+ 
+import android.annotation.SuppressLint;
+ import android.content.Intent;
+ import android.util.Pair;
+ 
+import org.chromium.base.ThreadUtils;
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.TabState;
+import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
+import org.chromium.chrome.browser.incognito.IncognitoNotificationService;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+import org.chromium.chrome.browser.metrics.PageLoadMetrics;
+import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabDelegateFactory;
+ import org.chromium.chrome.browser.tab.TabUma.TabCreationState;
+import org.chromium.chrome.browser.tabmodel.EmptyTabModel;
+import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
+ import org.chromium.chrome.browser.tabmodel.SingleTabModelSelector;
+ import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
+ import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
+import org.chromium.chrome.browser.tabmodel.TabModelObserver;
+ import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+ import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
+ import org.chromium.content_public.browser.ChildProcessImportance;
+@@ -38,7 +51,8 @@ public abstract class SingleTabActivity extends ChromeActivity {
+ 
+     @Override
+     protected TabModelSelector createTabModelSelector() {
+-        return new SingleTabModelSelector(this, false, false) {
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+        return new SingleTabModelSelector(this, incognitoOnly, false) {
+             @Override
+             public Tab openNewTab(LoadUrlParams loadUrlParams, TabLaunchType type, Tab parent,
+                     boolean incognito) {
+@@ -81,6 +95,7 @@ public abstract class SingleTabActivity extends ChromeActivity {
+      */
+     protected Tab createTab() {
+         Tab tab = null;
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+         boolean unfreeze = false;
+ 
+         int tabId = Tab.INVALID_TAB_ID;
+@@ -93,13 +108,14 @@ public abstract class SingleTabActivity extends ChromeActivity {
+         if (tabId != Tab.INVALID_TAB_ID && tabUrl != null && getActivityDirectory() != null) {
+             // Restore the tab.
+             TabState tabState = TabState.restoreTabState(getActivityDirectory(), tabId);
+-            tab = new Tab(tabId, Tab.INVALID_TAB_ID, false, getWindowAndroid(),
+-                    TabLaunchType.FROM_RESTORE, TabCreationState.FROZEN_ON_RESTORE, tabState);
+            tab = new Tab(tabId, Tab.INVALID_TAB_ID, incognitoOnly, this, getWindowAndroid(),
+                    TabLaunchType.FROM_RESTORE,
+                    TabCreationState.FROZEN_ON_RESTORE, tabState);
+             unfreeze = true;
+         }
+ 
+         if (tab == null) {
+-            tab = new Tab(Tab.INVALID_TAB_ID, Tab.INVALID_TAB_ID, false, getWindowAndroid(),
+            tab = new Tab(Tab.INVALID_TAB_ID, Tab.INVALID_TAB_ID, incognitoOnly, this, getWindowAndroid(),
+                     TabLaunchType.FROM_CHROME_UI, null, null);
+         }
+ 
+@@ -137,4 +153,31 @@ public abstract class SingleTabActivity extends ChromeActivity {
+ 
+     @Override
+     public void onCheckForUpdate(boolean updateAvailable) {}
+
+    private void handleTabClose() {
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+        if (incognitoOnly && isInitialized()) {
+            destroyIncognitoIfNecessary();
+        }
+    }
+
+    protected void destroyIncognitoIfNecessary() {
+        ThreadUtils.assertOnUiThread();
+
+        Profile profile = getTabModelSelector().getModel(true).getProfile();
+        // destroy the current tabmodel that will destroy tabs internally
+        getCurrentTabModel().destroy();
+        // Only delete the incognito profile if there are no incognito tabs open in any tab
+        // model selector as the profile is shared between them.
+        if (profile != null && !(IncognitoNotificationService.getIncognitoTabCount() > 0)) {
+            profile.destroyWhenAppropriate();
+            IncognitoNotificationManager.dismissIncognitoNotification();
+        }
+
+    }
+
+    @Override
+    protected void onDestroyInternal() {
+        handleTabClose();
+    }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
+index afc92bed..39caa0b 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
+@@ -31,6 +31,7 @@ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.widget.ControlContainer;
+ import org.chromium.content_public.browser.WebContents;
+ import org.chromium.content_public.browser.WebContentsObserver;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ 
+ import java.net.InetAddress;
+ import java.net.MalformedURLException;
+@@ -289,8 +290,9 @@ public final class WarmupManager {
+     public void createSpareWebContents() {
+         ThreadUtils.assertOnUiThread();
+         if (!LibraryLoader.isInitialized()) return;
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+         if (mSpareWebContents != null || SysUtils.isLowEndDevice()) return;
+-        mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(false, false);
+        mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(incognitoOnly, false);
+         mObserver = new RenderProcessGoneObserver();
+         mSpareWebContents.addObserver(mObserver);
+         mWebContentsCreationTimeMs = SystemClock.elapsedRealtime();
+@@ -316,7 +318,7 @@ public final class WarmupManager {
+      */
+     public WebContents takeSpareWebContents(boolean incognito, boolean initiallyHidden) {
+         ThreadUtils.assertOnUiThread();
+-        if (incognito || initiallyHidden) return null;
+        if ((incognito != mSpareWebContents.isIncognito()) || initiallyHidden) return null;
+         WebContents result = mSpareWebContents;
+         if (result == null) return null;
+         mSpareWebContents = null;
+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
+index e48a3e8..5435958 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.UrlConstants;
+ import org.chromium.chrome.browser.banners.AppBannerManager;
+ import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
+ import org.chromium.chrome.browser.download.DownloadUtils;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+ import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
+ import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
+@@ -175,6 +176,8 @@ public class AppMenuPropertiesDelegate {
+ 
+             MenuItem allBookmarksMenuItem = menu.findItem(R.id.all_bookmarks_menu_id);
+             // Hide 'History' in incognito only browser
+            boolean isIncognitoOnlyBrowser = IncognitoOnlyModeUtil.getInstance()
+                    .isIncognitoOnlyBrowser();
+             menu.findItem(R.id.open_history_menu_id).setVisible(!isIncognitoOnlyBrowser);
+ 
+             allBookmarksMenuItem.setTitle(mActivity.getString(R.string.menu_bookmarks));
+@@ -201,7 +204,7 @@ public class AppMenuPropertiesDelegate {
+             //                is not persisted when adding to the homescreen.
+             // * If creating shortcuts it not supported by the current home screen.
+             boolean canShowHomeScreenMenuItem = ShortcutHelper.isAddToHomeIntentSupported()
+-                    && !isChromeScheme && !isFileScheme && !isContentScheme && !isIncognito
+                    && !isChromeScheme && !isFileScheme && !isContentScheme && (!isIncognito || isIncognitoOnlyBrowser)
+                     && !TextUtils.isEmpty(url);
+             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
+ 
+@@ -224,7 +227,8 @@ public class AppMenuPropertiesDelegate {
+         }
+ 
+         if (isOverviewMenu) {
+-            if (isIncognito) {
+            if (isIncognito
+                    && !(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled())) {
+                 // Hide normal close all tabs item.
+                 menu.findItem(R.id.close_all_tabs_menu_id).setVisible(false);
+                 // Enable close incognito tabs only if there are incognito tabs.
+@@ -244,6 +248,7 @@ public class AppMenuPropertiesDelegate {
+         }
+ 
+         boolean incognitoMenuItemVisible = !isBottomSheetNtpMenu || !isIncognito;
+        incognitoMenuItemVisible &= !(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled());
+         // Disable new incognito tab when it is blocked (e.g. by a policy).
+         // findItem(...).setEnabled(...)" is not enough here, because of the inflated
+         // main_menu.xml contains multiple items with the same id in different groups
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
+index 03edf2d..fb2cc2e 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
+@@ -33,6 +33,7 @@ import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer;
+ import org.chromium.chrome.browser.compositor.scene_layer.TabListSceneLayer;
+ import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
+ import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tabmodel.TabModel;
+ import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+@@ -328,8 +329,10 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
+     @Override
+     public void setTabModelSelector(TabModelSelector modelSelector, TabContentManager manager) {
+         super.setTabModelSelector(modelSelector, manager);
+-        mStacks[0].setTabModel(modelSelector.getModel(false));
+-        mStacks[1].setTabModel(modelSelector.getModel(true));
+        mStacks[0].setTabModel(modelSelector
+            .getModel(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()));
+        mStacks[1].setTabModel(modelSelector
+            .getModel(!IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()));
+         resetScrollData();
+     }
+ 
+@@ -341,6 +344,9 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
+      * @VisibleForTesting
+      */
+     public Stack getTabStack(boolean incognito) {
+        if (IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()) {
+            return mStacks[incognito ? 0 : 1];
+        }
+         return mStacks[incognito ? 1 : 0];
+     }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
+index 8230bc2..687c8a4 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
+@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
+ import org.chromium.chrome.browser.compositor.layouts.eventfilter.ScrollDirection;
+ import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout;
+ import org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimation.OverviewAnimationType;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tabmodel.TabModel;
+ import org.chromium.chrome.browser.tabmodel.TabModelUtils;
+@@ -436,7 +437,9 @@ public class Stack {
+      * @return Whether or not the TabModel represented by this TabStackState should be displayed.
+      */
+     public boolean isDisplayable() {
+-        return !mTabModel.isIncognito() || (!mIsDying && mTabModel.getCount() > 0);
+        return (!mTabModel.isIncognito()
+                && !IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled())
+                || (!mIsDying && mTabModel.getCount() > 0);
+     }
+ 
+     private float getDefaultDiscardDirection() {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+index 25f1fd7..6257c82 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.compositor.layouts.eventfilter.GestureHandler
+ import org.chromium.chrome.browser.compositor.overlays.SceneOverlay;
+ import org.chromium.chrome.browser.compositor.scene_layer.SceneOverlayLayer;
+ import org.chromium.chrome.browser.compositor.scene_layer.TabStripSceneLayer;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
+ import org.chromium.chrome.browser.tabmodel.TabModel;
+@@ -377,7 +378,8 @@ public class StripLayoutHelperManager implements SceneOverlay {
+         mModelSelectorButton.setIncognito(mIsIncognito);
+         if (mTabModelSelector != null) {
+             boolean isVisible = mTabModelSelector.getModel(true).getCount() != 0;
+-            mModelSelectorButton.setVisible(isVisible);
+            mModelSelectorButton.setVisible(isVisible
+                    && !IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled());
+ 
+             float endMargin = isVisible
+                     ? MODEL_SELECTOR_BUTTON_WIDTH_DP + MODEL_SELECTOR_BUTTON_END_PADDING_DP
+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
+index 43b556f..2b92e83 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+@@ -59,9 +59,13 @@ import org.chromium.chrome.browser.browserservices.BrowserSessionContentUtils;
+ import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
+ import org.chromium.chrome.browser.datausage.DataUseTabUIManager;
+ import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
+ import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibilityDelegate;
+ import org.chromium.chrome.browser.gsa.GSAState;
+import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
+import org.chromium.chrome.browser.incognito.IncognitoNotificationService;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.metrics.PageLoadMetrics;
+ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+ import org.chromium.chrome.browser.page_info.PageInfoPopup;
+@@ -334,7 +338,12 @@ public class CustomTabActivity extends ChromeActivity {
+         if (mConnection.shouldHideDomainForSession(mSession)) {
+             getToolbarManager().setUrlBarHidden(true);
+         }
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+         int toolbarColor = mIntentDataProvider.getToolbarColor();
+        if (incognitoOnly) {
+            toolbarColor = ApiCompatibilityUtils.getColor(getResources(),
+                    R.color.incognito_primary_color);
+        }
+         getToolbarManager().updatePrimaryColor(toolbarColor, false);
+         if (!mIntentDataProvider.isOpenedByChrome()) {
+             getToolbarManager().setShouldUpdateToolbarPrimaryColor(false);
+@@ -390,7 +399,8 @@ public class CustomTabActivity extends ChromeActivity {
+             mConnection.cancelSpeculation(mSession);
+         }
+ 
+-        getTabModelSelector().getModel(false).addObserver(mTabModelObserver);
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+        getTabModelSelector().getModel(incognitoOnly).addObserver(mTabModelObserver);
+ 
+         boolean successfulStateRestore = false;
+         // Attempt to restore the previous tab state if applicable.
+@@ -412,7 +422,7 @@ public class CustomTabActivity extends ChromeActivity {
+             } else {
+                 mMainTab = createMainTab();
+             }
+-            getTabModelSelector().getModel(false).addTab(mMainTab, 0, mMainTab.getLaunchType());
+            getTabModelSelector().getModel(incognitoOnly).addTab(mMainTab, 0, mMainTab.getLaunchType());
+         }
+ 
+         // This cannot be done before because we want to do the reparenting only
+@@ -550,7 +560,9 @@ public class CustomTabActivity extends ChromeActivity {
+                 getIntent(), IntentHandler.EXTRA_TAB_ID, Tab.INVALID_TAB_ID);
+         int parentTabId = IntentUtils.safeGetIntExtra(
+                 getIntent(), IntentHandler.EXTRA_PARENT_TAB_ID, Tab.INVALID_TAB_ID);
+-        Tab tab = new Tab(assignedTabId, parentTabId, false, getWindowAndroid(),
+
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+        Tab tab = new Tab(assignedTabId, parentTabId, incognitoOnly, getWindowAndroid(),
+                 TabLaunchType.FROM_EXTERNAL_APP, null, null);
+         if (getIntent().getIntExtra(
+                     CustomTabIntentDataProvider.EXTRA_BROWSER_LAUNCH_SOURCE, ACTIVITY_TYPE_OTHER)
+@@ -588,12 +600,12 @@ public class CustomTabActivity extends ChromeActivity {
+                 webContentsStateOnLaunch = WEBCONTENTS_STATE_TRANSFERRED_WEBCONTENTS;
+                 webContents.resumeLoadingCreatedWebContents();
+             } else {
+-                webContents = WarmupManager.getInstance().takeSpareWebContents(false, false);
+                webContents = WarmupManager.getInstance().takeSpareWebContents(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled(), false);
+                 if (webContents != null) {
+                     webContentsStateOnLaunch = WEBCONTENTS_STATE_SPARE_WEBCONTENTS;
+                 } else {
+                     webContents =
+-                            WebContentsFactory.createWebContentsWithWarmRenderer(false, false);
+                            WebContentsFactory.createWebContentsWithWarmRenderer(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled(), false);
+                     webContentsStateOnLaunch = WEBCONTENTS_STATE_NO_WEBCONTENTS;
+                 }
+             }
+@@ -835,6 +847,13 @@ public class CustomTabActivity extends ChromeActivity {
+         if (getAppMenuHandler() != null) getAppMenuHandler().hideAppMenu();
+ 
+         super.finish();
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+        if (incognitoOnly) {
+            int incognitoCount = IncognitoNotificationService.getIncognitoTabCount();
+            if (incognitoCount == 0) {
+                IncognitoNotificationManager.dismissIncognitoNotification();
+            }
+        }
+         if (mIntentDataProvider != null && mIntentDataProvider.shouldAnimateOnFinish()) {
+             mShouldOverridePackage = true;
+             overridePendingTransition(mIntentDataProvider.getAnimationEnterRes(),
+@@ -853,7 +872,8 @@ public class CustomTabActivity extends ChromeActivity {
+     public final void finishAndClose(boolean reparenting) {
+         if (mIsClosing) return;
+         mIsClosing = true;
+-        if (!reparenting) {
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+        if (!reparenting && !incognitoOnly) {
+             // Closing the activity destroys the renderer as well. Re-create a spare renderer some
+             // time after, so that we have one ready for the next tab open. This does not increase
+             // memory consumption, as the current renderer goes away. We create a renderer as a lot
+@@ -1025,7 +1045,8 @@ public class CustomTabActivity extends ChromeActivity {
+     protected void setStatusBarColor(Tab tab, int color) {
+         // Intentionally do nothing as CustomTabActivity explicitly sets status bar color.  Except
+         // for Custom Tabs opened by Chrome.
+-        if (mIntentDataProvider.isOpenedByChrome()) super.setStatusBarColor(tab, color);
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+        if (mIntentDataProvider.isOpenedByChrome() && !incognitoOnly) super.setStatusBarColor(tab, color);
+     }
+ 
+     /**
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
+index f9e91ad..3e9bd1c 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
+@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.incognito;
+ 
+ import android.annotation.TargetApi;
+ import android.app.Activity;
+import android.util.SparseArray;
+ import android.app.ActivityManager;
+ import android.app.ActivityManager.AppTask;
+ import android.app.ActivityManager.RecentTaskInfo;
+@@ -24,15 +25,21 @@ import org.chromium.base.ContextUtils;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.base.VisibleForTesting;
+ import org.chromium.base.library_loader.LibraryProcessType;
+import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.ChromeTabbedActivity;
+ import org.chromium.chrome.browser.TabState;
+import org.chromium.chrome.browser.customtabs.CustomTabActivity;
+ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+ import org.chromium.chrome.browser.document.DocumentUtils;
+ import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.tabmodel.AsyncTabParams;
+import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
+ import org.chromium.chrome.browser.tabmodel.TabWindowManager;
+ import org.chromium.chrome.browser.tabmodel.TabbedModeTabPersistencePolicy;
+ import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
+ import org.chromium.content.browser.BrowserStartupController;
+import org.chromium.chrome.browser.webapps.WebappActivity;
+ 
+ import java.io.File;
+ import java.lang.ref.WeakReference;
+@@ -189,7 +196,9 @@ public class IncognitoNotificationService extends IntentService {
+                 for (int i = 0; i < runningActivities.size(); i++) {
+                     Activity activity = runningActivities.get(i).get();
+                     if (activity == null) continue;
+-                    if (!(activity instanceof ChromeTabbedActivity)) continue;
+                    if (!(activity instanceof ChromeTabbedActivity ||
+                            activity instanceof CustomTabActivity ||
+                            activity instanceof WebappActivity)) continue;
+ 
+                     ChromeTabbedActivity tabbedActivity = (ChromeTabbedActivity) activity;
+                     if (tabbedActivity.isActivityDestroyed()) continue;
+@@ -205,7 +214,7 @@ public class IncognitoNotificationService extends IntentService {
+                                 BottomSheet.SHEET_STATE_PEEK, false);
+                     }
+ 
+-                    tabbedActivity.getTabModelSelector().getModel(true).closeAllTabs(
+                    chromeActivity.getTabModelSelector().getModel(true).closeAllTabs(
+                             false, false);
+                 }
+             }
+@@ -229,4 +238,30 @@ public class IncognitoNotificationService extends IntentService {
+         return deletionSuccessful;
+     }
+ 
+    public static int getIncognitoTabCount() {
+        int count = 0;
+        List<WeakReference<Activity>> runningActivities =
+                ApplicationStatus.getRunningActivities();
+        for (int i = 0; i < runningActivities.size(); i++) {
+            Activity activity = runningActivities.get(i).get();
+            if (activity == null) continue;
+            if (!(activity instanceof ChromeTabbedActivity ||
+                    activity instanceof CustomTabActivity ||
+                    activity instanceof WebappActivity)) continue;
+
+            ChromeActivity chromeActivity = (ChromeActivity) activity;
+            if (chromeActivity.isActivityDestroyed()) continue;
+
+            count += chromeActivity.getTabModelSelector().getModel(true).getCount();
+        }
+        // Count tabs that are moving between activities (e.g. a tab that was recently reparented
+        // and hasn't been attached to its new activity yet).
+        SparseArray<AsyncTabParams> asyncTabParams = AsyncTabParamsManager.getAsyncTabParams();
+        for (int i = 0; i < asyncTabParams.size(); i++) {
+            Tab tab = asyncTabParams.valueAt(i).getTabToReparent();
+            if (tab != null && tab.isIncognito()) count++;
+        }
+        return count;
+    }
+
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoOnlyModeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoOnlyModeUtil.java
+new file mode 100644
+index 0000000..f6b17e7
+--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoOnlyModeUtil.java
+@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of The Linux Foundation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package org.chromium.chrome.browser.incognito;
+
+import org.chromium.base.CommandLine;
+import org.chromium.base.ContextUtils;
+import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
+
+/**
+ * Utility class for incognito only mode
+ */
+public class IncognitoOnlyModeUtil {
+    private static IncognitoOnlyModeUtil sInstance;
+
+    private IncognitoOnlyModeUtil() {}
+
+    public static IncognitoOnlyModeUtil getInstance() {
+        if (sInstance == null) {
+            sInstance = new IncognitoOnlyModeUtil();
+        }
+        return sInstance;
+    }
+    /**
+     * @return whether incognito only browser
+     */
+    public boolean isIncognitoOnlyBrowser() {
+        return CommandLine.getInstance().hasSwitch(ChromeSwitches.INCOGNITO_ONLY_MODE);
+    }
+
+    /**
+     * @return whether incognito only mode preference is enabled
+     */
+    public boolean isIncognitoOnlyPreferenceEnabled() {
+        return PrivacyPreferencesManager.getInstance(ContextUtils.getApplicationContext()).
+                isIncognitoOnlyEnabled();
+    }
+
+    /**
+     * @return whether incognito only browser or incognito only mode preference is enabled
+     */
+    public boolean isIncognitoOnlyModeEnabled() {
+        return isIncognitoOnlyBrowser() || isIncognitoOnlyPreferenceEnabled();
+    }
+
+}
+\ No newline at end of file
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
+index e594c57..def79eb 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
+@@ -20,6 +20,7 @@ import android.widget.FrameLayout;
+ import org.chromium.base.ApiCompatibilityUtils;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.WindowDelegate;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.ntp.NewTabPage;
+ import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
+ import org.chromium.chrome.browser.util.MathUtils;
+@@ -271,7 +272,8 @@ public class LocationBarPhone extends LocationBarLayout {
+ 
+         boolean showIncognitoBadge =
+                 getToolbarDataProvider() != null && getToolbarDataProvider().isIncognito();
+-        mIncognitoBadge.setVisibility(showIncognitoBadge ? VISIBLE : GONE);
+        mIncognitoBadge.setVisibility(showIncognitoBadge
+                && !IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled() ? VISIBLE : GONE);
+         updateIncognitoBadgePadding();
+     }
+ 
+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
+index 0d78e7c..b1b9f67 100644
+--- 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
+@@ -4,6 +4,8 @@
+ 
+ package org.chromium.chrome.browser.preferences.privacy;
+ 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+ import android.os.Bundle;
+ import android.preference.CheckBoxPreference;
+ import android.preference.Preference;
+@@ -18,8 +20,11 @@ import org.chromium.base.SysUtils;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+import org.chromium.chrome.browser.ApplicationLifetime;
+import org.chromium.chrome.browser.ChromeSwitches;
+ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
+ import org.chromium.chrome.browser.help.HelpAndFeedback;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.physicalweb.PhysicalWeb;
+ import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
+ import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
+@@ -41,6 +46,7 @@ public class PrivacyPreferences extends PreferenceFragment
+     private static final String PREF_SAFE_BROWSING = "safe_browsing";
+     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
+     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
+    private static final String PREF_INCOGNITO_ONLY = "incognito_only";
+     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_PHYSICAL_WEB = "physical_web";
+@@ -129,6 +135,18 @@ public class PrivacyPreferences extends PreferenceFragment
+             recordNetworkPredictionEnablingUMA((boolean) newValue);
+         } else if (PREF_NAVIGATION_ERROR.equals(key)) {
+             PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
+        } else if (PREF_INCOGNITO_ONLY.equals(key)) {
+            incognitoOnlyPreferenceDialog(preference, (boolean) newValue).show();
+        }
+
+        boolean isIncognitoOnlyBrowser = IncognitoOnlyModeUtil.getInstance()
+                .isIncognitoOnlyBrowser();
+        ChromeBaseCheckBoxPreference incognitoOnlyPref =
+                (ChromeBaseCheckBoxPreference) findPreference(PREF_INCOGNITO_ONLY);
+        if (isIncognitoOnlyBrowser) {
+            preferenceScreen.removePreference(incognitoOnlyPref);
+        } else {
+            incognitoOnlyPref.setOnPreferenceChangeListener(this);
+         }
+ 
+         return true;
+@@ -189,6 +207,13 @@ public class PrivacyPreferences extends PreferenceFragment
+             doNotTrackPref.setSummary(prefServiceBridge.isDoNotTrackEnabled() ? textOn : textOff);
+         }
+ 
+        Preference incognitoOnlyPref = findPreference(PREF_INCOGNITO_ONLY);
+        if (incognitoOnlyPref != null) {
+            boolean isIncognitoOnlyEnabled = privacyPrefManager.isIncognitoOnlyEnabled();
+            incognitoOnlyPref.setChecked(isIncognitoOnlyEnabled);
+            incognitoOnlyPref.setSummary(isIncognitoOnlyEnabled ? textOn : textOff);
+        }
+
+         Preference contextualPref = findPreference(PREF_CONTEXTUAL_SEARCH);
+         if (contextualPref != null) {
+             boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
+@@ -254,4 +279,38 @@ public class PrivacyPreferences extends PreferenceFragment
+         }
+         return false;
+     }
+
+    private AlertDialog incognitoOnlyPreferenceDialog(final Preference preference,
+                                                      final boolean isChecked) {
+        AlertDialog dialog = new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
+                .setTitle(isChecked ? R.string.incognito_only_turn_on_title
+                        : R.string.incognito_only_turn_off_title)
+                .setMessage(isChecked ? R.string.incognito_only_turn_on_confirmation
+                        : R.string.incognito_only_turn_off_confirmation)
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int id) {
+                        ((ChromeBaseCheckBoxPreference) preference).setChecked(!isChecked);
+                        dialog.dismiss();
+                    }
+                })
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        PrivacyPreferencesManager.getInstance(getActivity()).
+                                setIncognitoOnlyEnabled((boolean) isChecked);
+                        dialog.dismiss();
+                        ApplicationLifetime.terminate(true);
+                    }
+                })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialog) {
+                        ((ChromeBaseCheckBoxPreference) preference).setChecked(!isChecked);
+                    }
+                })
+                .create();
+
+        return dialog;
+    }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
+index 4ddbd4d..9e2a163 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
+@@ -38,6 +38,7 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
+     private static final String PREF_BANDWIDTH_NO_CELLULAR_OLD = "prefetch_bandwidth_no_cellular";
+     private static final String ALLOW_PRERENDER_OLD = "allow_prefetch";
+     private static final String PREF_PHYSICAL_WEB = "physical_web";
+    private static final String INCOGNITO_ONLY_PREFERENCE = "incognito_only_preference";
+     private static final int PHYSICAL_WEB_OFF = 0;
+     private static final int PHYSICAL_WEB_ON = 1;
+     private static final int PHYSICAL_WEB_ONBOARDING = 2;
+@@ -339,4 +340,23 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
+         int state = mSharedPreferences.getInt(PREF_PHYSICAL_WEB, PHYSICAL_WEB_ONBOARDING);
+         return (state == PHYSICAL_WEB_ON);
+     }
+
+    /**
+     * Check whether Incognito Only preference is enabled
+     *
+     * @return whether Incognito Only preference is enabled, false by default
+     */
+    public boolean isIncognitoOnlyEnabled() {
+        return mSharedPreferences.getBoolean(INCOGNITO_ONLY_PREFERENCE, false);
+    }
+
+    /**
+     * Sets the Incognito Only preference, which enables the browser to switch to incognito only
+     * mode
+     *
+     * @param enabled A boolean indicating whether to switch to incognito only mode.
+     */
+    public void setIncognitoOnlyEnabled(boolean enabled) {
+        mSharedPreferences.edit().putBoolean(INCOGNITO_ONLY_PREFERENCE, enabled).apply();
+    }
+ }
+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 344a2ed..d54accf 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
+@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+ import org.chromium.chrome.browser.preferences.LocationSettings;
+ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+ import org.chromium.chrome.browser.preferences.PreferenceUtils;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -110,6 +111,13 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     }
+ 
+     private void configurePreferences() {
+        // Remove 'All sites' menu for incognito only browser
+        boolean isIncognitoOnlyBrowser = IncognitoOnlyModeUtil.getInstance()
+                .isIncognitoOnlyBrowser();
+        if (isIncognitoOnlyBrowser) {
+            getPreferenceScreen().removePreference(findPreference(ALL_SITES_KEY));
+        }
+
+         if (mMediaSubMenu) {
+             // The Media sub-menu only contains Protected Content and Autoplay, so remove all other
+             // menus.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java
+index d90ccc3..ddc30f2 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java
+@@ -9,6 +9,7 @@ import android.content.Context;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.device.DeviceClassManager;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.snackbar.Snackbar;
+ import org.chromium.chrome.browser.snackbar.SnackbarManager;
+ import org.chromium.chrome.browser.tab.Tab;
+@@ -64,7 +65,8 @@ public class UndoBarController implements SnackbarManager.SnackbarController {
+         mTabModelObserver = new EmptyTabModelObserver() {
+             private boolean disableUndo() {
+                 return AccessibilityUtil.isAccessibilityEnabled()
+-                        || DeviceClassManager.enableAccessibilityLayout();
+                        || DeviceClassManager.enableAccessibilityLayout()
+                        || IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+             }
+ 
+             @Override
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java
+index c3e7aa0..b1d758c 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java
+@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.tabmodel;
+ import org.chromium.base.ObserverList;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
+import org.chromium.chrome.browser.incognito.IncognitoNotificationService;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.tab.Tab;
+ 
+@@ -82,7 +83,7 @@ public class IncognitoTabModel implements TabModel {
+ 
+         // Only delete the incognito profile if there are no incognito tabs open in any tab
+         // model selector as the profile is shared between them.
+-        if (profile != null && !mDelegate.doIncognitoTabsExist()) {
+        if (profile != null && !(IncognitoNotificationService.getIncognitoTabCount() > 0)) {
+             IncognitoNotificationManager.dismissIncognitoNotification();
+ 
+             profile.destroyWhenAppropriate();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+index 5221244..c976cd4 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+@@ -5,6 +5,7 @@
+ package org.chromium.chrome.browser.tabmodel;
+ 
+ import org.chromium.base.ObserverList;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
+ import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
+@@ -40,7 +41,8 @@ public abstract class TabModelSelectorBase implements TabModelSelector {
+         for (int i = 0; i < models.length; i++) {
+             tabModels.add(models[i]);
+         }
+-        mActiveModelIndex = startIncognito ? INCOGNITO_TAB_MODEL_INDEX : NORMAL_TAB_MODEL_INDEX;
+        mActiveModelIndex = (startIncognito ||
+                             IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()) ? INCOGNITO_TAB_MODEL_INDEX : NORMAL_TAB_MODEL_INDEX;
+         mTabModels = Collections.unmodifiableList(tabModels);
+ 
+         TabModelObserver tabModelObserver = new EmptyTabModelObserver() {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java
+index e69d43c..71893ff 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java
+@@ -14,6 +14,7 @@ import android.os.Build;
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.VisibleForTesting;
+ import org.chromium.chrome.browser.document.DocumentUtils;
+import org.chromium.chrome.browser.incognito.IncognitoNotificationService;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabIdManager;
+ import org.chromium.chrome.browser.tabmodel.IncognitoTabModel.IncognitoTabModelDelegate;
+@@ -105,7 +106,7 @@ public class DocumentTabModelSelector extends TabModelSelectorBase implements Ta
+             public boolean doIncognitoTabsExist() {
+                 // TODO(dfalcantara): Devices in document mode do not trigger the TabWindowManager.
+                 //                    Revisit this when we have a Samsung L multi-instance device.
+-                return mIncognitoTabModel.getCount() > 0;
+                return IncognitoNotificationService.getIncognitoTabCount() > 0;
+             }
+         }, mActivityDelegate);
+         initializeTabIdCounter();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
+index 26bb763..b01a165 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
+@@ -52,6 +52,7 @@ import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
+ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+ import org.chromium.chrome.browser.document.DocumentUtils;
+ import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
+ import org.chromium.chrome.browser.tab.EmptyTabObserver;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabDelegateFactory;
+@@ -814,6 +815,12 @@ public class WebappActivity extends SingleTabActivity {
+             mBrandColor = (int) mWebappInfo.themeColor();
+         }
+ 
+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
+        if (incognitoOnly) {
+            mBrandColor = ApiCompatibilityUtils.getColor(getResources(),
+                    R.color.incognito_primary_color);
+        }
+
+         int taskDescriptionColor =
+                 ApiCompatibilityUtils.getColor(getResources(), R.color.default_primary_color);
+ 
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+index a81975d..f14b395 100644
+--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -225,6 +225,26 @@ CHAR-LIMIT guidelines:
+         Retry
+       </message>
+ 
+      <!-- Incognito Only mode -->
+      <message name="IDS_INCOGNITO_ONLY_TITLE" desc="The label for incognito-only toggle option.">
+        &quot;Incognito Only&quot; mode
+      </message>
+      <message name="IDS_INCOGNITO_ONLY_SUMMARY" desc="The summary for incognito-only toggle option.">
+        Browse using only incognito tabs
+      </message>
+      <message name="IDS_INCOGNITO_ONLY_TURN_ON_TITLE" desc="The tooltip for enabling incognito-only mode.">
+        Enable &quot;Incognito Only&quot; mode
+      </message>
+      <message name="IDS_INCOGNITO_ONLY_TURN_OFF_TITLE" desc="The tooltip for disabling incognito-only mode.">
+        Disable &quot;Incognito Only&quot; mode
+      </message>
+      <message name="IDS_INCOGNITO_ONLY_TURN_ON_CONFIRMATION" desc="The confirmation message for turning on incognito-only mode.">
+        Browser will <ph name="BEGIN_BOLD">&lt;b&gt;</ph>restart<ph name="END_BOLD">&lt;/b&gt;</ph> in incognito-only mode. All opened tabs will be closed.
+      </message>
+      <message name="IDS_INCOGNITO_ONLY_TURN_OFF_CONFIRMATION" desc="The confirmation message for turning off incognito-only mode.">
+        Browser will <ph name="BEGIN_BOLD">&lt;b&gt;</ph>restart<ph name="END_BOLD">&lt;/b&gt;</ph> in regular mode. All opened tabs will be closed.
+      </message>
+
+       <!-- Main Preferences -->
+       <message name="IDS_PREFERENCES" desc="Title for Chrome's Settings.">
+         Settings
+diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
+index ba24b98..a576f9d 100644
+--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
+@@ -491,6 +491,7 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGenerator.java",
+   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java",
+   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java",
+  "java/src/org/chromium/chrome/browser/incognito/IncognitoOnlyModeUtil.java",
+   "java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java",
+   "java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java",
+   "java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
Author	SHA1	Message	Date
csagan5	10661f0b36	Release 67.0.3396.95	2018-06-22 08:46:05 +02:00
Carl	ff372ffe53	Add bug report and feature request issue templates	2018-06-21 21:44:22 +02:00
csagan5	c33f289a21	Typo fix	2018-06-20 21:22:30 +02:00
csagan5	d9a4d2dc88	Release 67.0.3396.92	2018-06-20 21:18:07 +02:00
csagan5	6e86d3db21	Replace Patreon with LiberaPay	2018-06-18 23:07:12 +02:00
csagan5	b11d180a37	Update patch as per suggestions in #69	2018-06-18 20:26:45 +02:00
csagan5	032d2ef9f2	Adding new patch for experiments on canvas RGB randomisation	2018-06-18 09:11:23 +02:00
csagan5	1951b38c64	Add F.A.Q. about DNS-over-HTTPS	2018-06-17 23:55:34 +02:00
csagan5	41c5c0f0cf	Move work-in-progress patches in subdirectory	2018-06-15 14:45:19 +02:00
csagan5	d0bab4a8da	Added two work-in-progress patches for Incognito-Only feature	2018-06-15 14:43:45 +02:00
csagan5	ef0cca39ce	Make features list more compact	2018-06-15 11:47:05 +02:00
csagan5	d94f36a0f7	Adding patches for release 67.0.3396.88	2018-06-15 11:27:35 +02:00
csagan5	3b1875efed	Release 67.0.3396.88	2018-06-15 11:26:26 +02:00
csagan5	acba336f2e	Add links for all related projects/credits	2018-06-12 14:04:27 +02:00
csagan5	61b6f9ee1d	Align with home page	2018-06-11 21:27:04 +02:00
csagan5	210a14d7ed	Release 67.0.3396.82	2018-06-11 18:55:40 +02:00
csagan5	91cc88eb37	Updated changelog	2018-06-09 11:12:45 +02:00
csagan5	4fc10e560b	Release 67.0.3396.76	2018-06-08 23:59:52 +02:00
CarlandGitHub	01ecc5d52f	Add link to Patreon	2018-06-04 20:53:49 +02:00
csagan5	7edcab0232	Add missing patch	2018-06-04 20:46:26 +02:00
csagan5	b4ada5bd99	Release 67.0.3396.72	2018-06-04 20:45:57 +02:00
csagan5	cfa7aca62a	Add missing patch	2018-06-01 15:59:14 +02:00
csagan5	9eca1ff0b3	Release 67.0.3396.67	2018-06-01 15:58:52 +02:00
csagan5	aac51e0a5a	Release 66.0.3359.202	2018-05-29 20:52:06 +02:00
csagan5	ea53ed1889	Release 66.0.3359.200	2018-05-26 11:13:29 +02:00
csagan5	780bb60137	Release 66.0.3359.196	2018-05-24 09:59:15 +02:00
csagan5	0fd859a0a6	Two new patches	2018-05-20 22:07:39 +02:00