RecordUserAction.record("MobileMenuRequestEnableJavascript");
} else if (id == R.id.reader_mode_prefs_id) {
DomDistillerUIUtils.openSettings(currentTab.getWebContents());
@@ -76,7 +76,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
-@@ -1757,6 +1757,14 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+@@ -1767,6 +1767,14 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
reportNewTabShortcutUsed(true);
getTabCreator(true).launchNTP();
}
@@ -94,7 +94,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/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -26,6 +26,7 @@ import org.chromium.base.metrics.RecordHistogram;
+@@ -27,6 +27,7 @@ import org.chromium.base.metrics.RecordHistogram;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.ChromeSwitches;
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
import org.chromium.chrome.browser.ShortcutHelper;
import org.chromium.chrome.browser.banners.AppBannerManager;
import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
-@@ -224,6 +225,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -235,6 +236,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
// Prepare translate menu button.
prepareTranslateMenuItem(menu, currentTab);
@@ -111,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
// Hide 'Add to homescreen' for the following:
// * chrome:// pages - Android doesn't know how to direct those URLs.
// * incognito pages - To avoid problems where users create shortcuts in incognito
-@@ -299,6 +302,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -310,6 +313,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
PrefServiceBridge.getInstance().isIncognitoModeManaged());
}
@@ -158,7 +158,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
-@@ -201,6 +201,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -205,6 +205,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
}
}
@@ -170,7 +170,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
-@@ -2952,6 +2952,17 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
Turn on Request desktop site
@@ -189,5 +189,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
Appearance
--
-2.11.0
+2.17.1
diff --git a/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch b/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch
index b447d1ac..e5762575 100644
--- a/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch
+++ b/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch
@@ -3,13 +3,13 @@ Date: Wed, 18 Oct 2017 21:26:53 +0200
Subject: Add menu option to toggle global Javascript preference
---
- 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 +++++
- .../appmenu/AppMenuPropertiesDelegateImpl.java | 39 ++++++++++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java | 1 +
- .../java/strings/android_chrome_strings.grd | 11 ++++++
+ .../java/res/menu/custom_tabs_menu.xml | 12 ++++++
+ chrome/android/java/res/menu/main_menu.xml | 13 +++++++
+ .../chrome/browser/ChromeActivity.java | 8 ++++
+ .../chrome/browser/ChromeTabbedActivity.java | 8 ++++
+ .../AppMenuPropertiesDelegateImpl.java | 39 +++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java | 1 +
+ .../java/strings/android_chrome_strings.grd | 11 ++++++
7 files changed, 92 insertions(+)
diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
@@ -74,7 +74,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
-@@ -2149,6 +2149,14 @@ public abstract class ChromeActivity
+@@ -2216,6 +2216,14 @@ public abstract class ChromeActivity
currentTab.getWebContents().getNavigationController().setUseDesktopUserAgent(
!usingDesktopUserAgent, reloadOnChange);
RecordUserAction.record("MobileMenuRequestDesktopSite");
@@ -92,7 +92,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
-@@ -1802,6 +1802,14 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+@@ -1813,6 +1813,14 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
}
RecordUserAction.record("MobileMenuDownloadManager");
@@ -110,7 +110,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/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -241,6 +241,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -252,6 +252,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
@@ -119,7 +119,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()));
-@@ -432,6 +434,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -438,6 +440,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
}
}
@@ -166,7 +166,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
-@@ -202,6 +202,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -206,6 +206,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
}
updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
@@ -177,7 +177,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
-@@ -2932,6 +2932,17 @@ To change this setting, <resetlink>reset sync<resetlink>reset sync
Find in page
@@ -196,5 +196,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
Desktop site
--
-2.11.0
+2.17.1
diff --git a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch
index bc4191ef..c5b149a9 100644
--- a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch
+++ b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch
@@ -3,24 +3,23 @@ Date: Thu, 5 Dec 2019 22:41:25 +0100
Subject: Add option to configure the ad blocker filters URL
---
- chrome/android/chrome_java_sources.gni | 2 +
- chrome/android/java/res/layout/adblock_editor.xml | 65 ++++++++++++++++
- chrome/android/java/res/values/values.xml | 2 +
- .../android/java/res/xml/adblock_preferences.xml | 25 ++++++
- chrome/android/java/res/xml/main_preferences.xml | 11 ++-
- .../chrome/browser/preferences/AdBlockEditor.java | 91 ++++++++++++++++++++++
- .../browser/preferences/AdBlockPreferences.java | 53 +++++++++++++
- .../chrome/browser/util/FeatureUtilities.java | 10 +++
- .../java/strings/android_chrome_strings.grd | 14 ++++
- chrome/app/generated_resources.grd | 10 +++
- chrome/browser/android/feature_utilities.cc | 8 ++
- chrome/browser/browser_process_impl.cc | 3 +-
- .../browser/net/system_network_context_manager.cc | 3 +
- chrome/common/pref_names.cc | 3 +
- chrome/common/pref_names.h | 1 +
- .../component_updater/adblock_updater_service.cc | 6 +-
- .../component_updater/adblock_updater_service.h | 3 +-
- 17 files changed, 302 insertions(+), 8 deletions(-)
+ chrome/android/chrome_java_sources.gni | 2 +
+ .../java/res/layout/adblock_editor.xml | 65 +++++++++++++
+ chrome/android/java/res/values/values.xml | 2 +
+ .../java/res/xml/adblock_preferences.xml | 25 +++++
+ .../android/java/res/xml/main_preferences.xml | 11 ++-
+ .../browser/preferences/AdBlockEditor.java | 91 +++++++++++++++++++
+ .../preferences/AdBlockPreferences.java | 53 +++++++++++
+ .../java/strings/android_chrome_strings.grd | 14 +++
+ chrome/app/generated_resources.grd | 10 ++
+ chrome/browser/android/feature_utilities.cc | 8 ++
+ chrome/browser/browser_process_impl.cc | 3 +-
+ .../net/system_network_context_manager.cc | 3 +
+ chrome/common/pref_names.cc | 3 +
+ chrome/common/pref_names.h | 1 +
+ .../adblock_updater_service.cc | 6 +-
+ .../adblock_updater_service.h | 3 +-
+ 16 files changed, 292 insertions(+), 8 deletions(-)
create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java
@@ -29,7 +28,7 @@ Subject: Add option to configure the ad blocker filters URL
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
-@@ -1266,6 +1266,8 @@ chrome_java_sources = [
+@@ -1277,6 +1277,8 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java",
"java/src/org/chromium/chrome/browser/preferences/Preferences.java",
"java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java",
@@ -111,7 +110,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
-@@ -68,6 +68,8 @@
+@@ -70,6 +70,8 @@
@@ -153,15 +152,16 @@ new file mode 100644
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
-@@ -61,19 +61,24 @@
+@@ -60,20 +60,25 @@
+ android:key="privacy"
android:order="13"
android:title="@string/prefs_privacy"/>
-
-+
@@ -387,7 +362,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
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
-@@ -9505,6 +9505,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9603,6 +9603,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
Never show this again.
@@ -407,7 +382,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/android/feature_utilities.cc
--- a/chrome/browser/android/feature_utilities.cc
+++ b/chrome/browser/android/feature_utilities.cc
-@@ -58,6 +58,14 @@ std::string GetReachedCodeProfilerTrialGroup() {
+@@ -50,6 +50,14 @@ std::string GetReachedCodeProfilerTrialGroup() {
} // namespace android
} // namespace chrome
@@ -425,7 +400,7 @@ diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/androi
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
-@@ -1032,7 +1032,8 @@ BrowserProcessImpl::adblock_updater() {
+@@ -1028,7 +1028,8 @@ BrowserProcessImpl::adblock_updater() {
adblock_updater_ = std::make_unique(
g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),
std::move(scheduler),
@@ -438,7 +413,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -391,6 +391,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+@@ -405,6 +405,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
ssl_config_service_manager_(
SSLConfigServiceManager::CreateDefaultManager(local_state_)),
proxy_config_monitor_(local_state_) {
@@ -447,7 +422,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
#if !defined(OS_ANDROID)
// QuicAllowed was not part of Android policy.
const base::Value* value =
-@@ -462,6 +464,7 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+@@ -508,6 +510,7 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
}
void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -458,7 +433,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
-@@ -1871,6 +1871,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -1925,6 +1925,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
// capture devices without prompt.
const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
@@ -512,5 +487,5 @@ diff --git a/components/component_updater/adblock_updater_service.h b/components
// Adds an observer for this class. An observer should not be added more
--
-2.11.0
+2.17.1
diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
index 9e71e808..8bc52024 100644
--- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
+++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
@@ -3,17 +3,17 @@ Date: Sat, 7 Sep 2019 15:07:42 +0200
Subject: Add option to not persist tabs across sessions
---
- chrome/android/java/res/values/values.xml | 3 +++
- chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
- .../org/chromium/chrome/browser/ChromeTabbedActivity.java | 4 +++-
- .../browser/preferences/privacy/PrivacyPreferences.java | 12 ++++++++++++
- chrome/android/java/strings/android_chrome_strings.grd | 6 ++++++
+ chrome/android/java/res/values/values.xml | 3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
+ .../chrome/browser/ChromeTabbedActivity.java | 4 +++-
+ .../preferences/privacy/PrivacyPreferences.java | 12 ++++++++++++
+ .../android/java/strings/android_chrome_strings.grd | 6 ++++++
5 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
-@@ -62,6 +62,9 @@
+@@ -64,6 +64,9 @@
@@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -1166,8 +1166,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+@@ -1173,8 +1173,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
boolean hadCipherData =
CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
@@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3764,6 +3764,12 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -3699,6 +3699,12 @@ The site does NOT gain access to the camera. The camera images are only visible
IMAGE
@@ -120,5 +120,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
LINK
--
-2.11.0
+2.17.1
diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch
index 70a084f6..d0747e8d 100644
--- a/build/patches/Add-option-to-use-home-page-as-NTP.patch
+++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch
@@ -4,35 +4,35 @@ Subject: Add option to use home page as NTP
Use about:blank as default homepage
---
- .../android/java/res/xml/homepage_preferences.xml | 5 +++++
- .../partnercustomizations/HomepageManager.java | 24 ++++++++++++++++++++--
- .../browser/preferences/HomepagePreferences.java | 10 +++++++++
- .../chrome/browser/tabmodel/TabCreatorManager.java | 11 ++++++++--
- .../java/strings/android_chrome_strings.grd | 3 +++
- chrome/browser/ui/browser_ui_prefs.cc | 2 ++
- chrome/common/pref_names.cc | 4 ++++
- chrome/common/pref_names.h | 1 +
+ .../java/res/xml/homepage_preferences.xml | 5 ++++
+ .../HomepageManager.java | 24 +++++++++++++++++--
+ .../preferences/HomepagePreferences.java | 10 ++++++++
+ .../browser/tabmodel/TabCreatorManager.java | 11 +++++++--
+ .../java/strings/android_chrome_strings.grd | 3 +++
+ chrome/browser/ui/browser_ui_prefs.cc | 2 ++
+ chrome/common/pref_names.cc | 4 ++++
+ chrome/common/pref_names.h | 1 +
8 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/android/java/res/xml/homepage_preferences.xml
--- a/chrome/android/java/res/xml/homepage_preferences.xml
+++ b/chrome/android/java/res/xml/homepage_preferences.xml
-@@ -7,6 +7,11 @@
+@@ -6,6 +6,11 @@
+
-
+
-+
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-@@ -32,6 +32,7 @@ public class HomepageManager {
+@@ -31,6 +31,7 @@ public class HomepageManager {
}
private static final String PREF_HOMEPAGE_ENABLED = "homepage";
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
private static final String PREF_HOMEPAGE_CUSTOM_URI = "homepage_custom_uri";
private static final String PREF_HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled";
-@@ -91,7 +92,8 @@ public class HomepageManager {
+@@ -90,7 +91,8 @@ public class HomepageManager {
*/
public static boolean shouldCloseAppWithZeroTabs() {
return HomepageManager.isHomepageEnabled()
@@ -51,7 +51,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
/**
@@ -111,7 +113,7 @@ public class HomepageManager {
- * @return The default homepage URI.
+ * if the homepage button is force enabled via flag.
*/
public static String getDefaultHomepageUri() {
- return UrlConstants.NTP_NON_NATIVE_URL;
@@ -59,10 +59,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
}
/**
-@@ -125,6 +127,14 @@ public class HomepageManager {
+@@ -124,6 +126,14 @@ public class HomepageManager {
+ return mSharedPreferences.getBoolean(PREF_HOMEPAGE_ENABLED, true);
}
- /**
++ /**
+ * Returns the user preference for whether the New Tab Page is the homepage or not.
+ *
+ */
@@ -70,14 +71,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
+ return mSharedPreferences.getBoolean(PREF_NTP_IS_HOMEPAGE, false);
+ }
+
-+ /**
+ /**
* Sets the user preference for whether the homepage is enabled.
*/
- public void setPrefHomepageEnabled(boolean enabled) {
-@@ -138,6 +148,16 @@ public class HomepageManager {
+@@ -137,6 +147,16 @@ public class HomepageManager {
+ notifyHomepageUpdated();
}
- /**
++ /**
+ * Sets the user preference for whether the new tab page is the homepage or not.
+ */
+ public void setPrefNTPIsHomepageEnabled(boolean enabled) {
@@ -87,14 +88,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
+ notifyHomepageUpdated();
+ }
+
-+ /**
+ /**
* @return User specified homepage custom URI string.
*/
- public String getPrefHomepageCustomUri() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java
-@@ -20,6 +20,7 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
+@@ -19,6 +19,7 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
@VisibleForTesting
public static final String PREF_HOMEPAGE_SWITCH = "homepage_switch";
private static final String PREF_HOMEPAGE_EDIT = "homepage_edit";
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Hom
private HomepageManager mHomepageManager;
private Preference mHomepageEdit;
-@@ -42,6 +43,15 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
+@@ -39,6 +40,15 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
return true;
});
@@ -153,20 +153,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre
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
-@@ -663,6 +663,9 @@ CHAR-LIMIT guidelines:
-
- Open this page
+@@ -668,6 +668,9 @@ CHAR-LIMIT guidelines:
+
+ Search and site suggestions disabled
+
+ Use for new tabs
+
-
-
+
+
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
-@@ -54,6 +54,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -55,6 +55,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
GetHomeButtonAndHomePageIsNewTabPageFlags());
registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
GetHomeButtonAndHomePageIsNewTabPageFlags());
@@ -192,8 +192,8 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
-@@ -318,6 +318,7 @@ extern const char kSettingsShowBrowserBanner[];
- extern const char kSettingsShowOSBanner[];
+@@ -322,6 +322,7 @@ extern const char kSettingsShowOSBanner[];
+ extern const char kDeviceLoginScreenWebUsbAllowDevicesForUrls[];
#endif // defined(OS_CHROMEOS)
extern const char kShowHomeButton[];
+extern const char kNewTabPageIsHomePage[];
@@ -201,5 +201,5 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
extern const char kAllowDeletingBrowserHistory[];
#if !defined(OS_ANDROID)
--
-2.11.0
+2.17.1
diff --git a/build/patches/Add-site-settings-option-for-session-only-cookies.patch b/build/patches/Add-site-settings-option-for-session-only-cookies.patch
index 776213cf..3a96f4cf 100644
--- a/build/patches/Add-site-settings-option-for-session-only-cookies.patch
+++ b/build/patches/Add-site-settings-option-for-session-only-cookies.patch
@@ -3,12 +3,12 @@ Date: Tue, 28 Aug 2018 23:27:23 +0200
Subject: Add site settings option for session-only cookies
---
- chrome/android/java/res/values/values.xml | 3 +++
- .../android/java/res/xml/website_preferences.xml | 7 ++++++
- .../browser/preferences/PrefServiceBridge.java | 10 +++++++++
- .../website/SingleCategoryPreferences.java | 21 +++++++++++++++++-
- .../java/strings/android_chrome_strings.grd | 6 ++++++
- .../android/preferences/pref_service_bridge.cc | 25 ++++++++++++++++++++++
+ chrome/android/java/res/values/values.xml | 3 +++
+ .../java/res/xml/website_preferences.xml | 7 ++++++
+ .../preferences/PrefServiceBridge.java | 10 ++++++++
+ .../website/SingleCategoryPreferences.java | 21 +++++++++++++++-
+ .../java/strings/android_chrome_strings.grd | 6 +++++
+ .../preferences/pref_service_bridge.cc | 25 +++++++++++++++++++
6 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
@@ -44,44 +44,37 @@ diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/androi
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
-@@ -242,6 +242,10 @@ public class PrefServiceBridge {
- return nativeGetBlockThirdPartyCookiesEnabled();
+@@ -265,6 +265,10 @@ public class PrefServiceBridge {
+ return PrefServiceBridgeJni.get().getBlockThirdPartyCookiesEnabled(PrefServiceBridge.this);
}
+ public boolean isCookiesSessionOnlyEnabled() {
-+ return nativeGetCookiesSessionOnlyEnabled();
++ return PrefServiceBridgeJni.get().getCookiesSessionOnlyEnabled(PrefServiceBridge.this);
+ }
+
/**
* @return Whether third-party cookie blocking is configured by policy
*/
-@@ -631,6 +635,10 @@ public class PrefServiceBridge {
- nativeSetBlockThirdPartyCookiesEnabled(enabled);
+@@ -668,6 +672,10 @@ public class PrefServiceBridge {
+ PrefServiceBridge.this, enabled);
}
+ public void setCookiesSessionOnlyEnabled(boolean enabled) {
-+ nativeSetCookiesSessionOnlyEnabled(enabled);
++ PrefServiceBridgeJni.get().setCookiesSessionOnlyEnabled(PrefServiceBridge.this, enabled);
+ }
+
public void setDoNotTrackEnabled(boolean enabled) {
- nativeSetDoNotTrackEnabled(enabled);
+ PrefServiceBridgeJni.get().setDoNotTrackEnabled(PrefServiceBridge.this, enabled);
}
-@@ -1094,6 +1102,7 @@ public class PrefServiceBridge {
- private native boolean nativeGetAutoplayEnabled();
- private native boolean nativeGetBackgroundSyncEnabled();
- private native boolean nativeGetBlockThirdPartyCookiesEnabled();
-+ private native boolean nativeGetCookiesSessionOnlyEnabled();
- private native boolean nativeGetBlockThirdPartyCookiesManaged();
- private native boolean nativeGetRememberPasswordsEnabled();
- private native boolean nativeGetPasswordManagerAutoSigninEnabled();
-@@ -1141,6 +1150,7 @@ public class PrefServiceBridge {
- private native void nativeSetAutoplayEnabled(boolean enabled);
- private native void nativeSetAllowCookiesEnabled(boolean enabled);
- private native void nativeSetBackgroundSyncEnabled(boolean enabled);
-+ private native void nativeSetCookiesSessionOnlyEnabled(boolean enabled);
- private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
- private native void nativeSetClipboardEnabled(boolean enabled);
- private native void nativeSetDoNotTrackEnabled(boolean enabled);
+@@ -1138,6 +1146,8 @@ public class PrefServiceBridge {
+
+ @NativeMethods
+ public interface Natives {
++ boolean getCookiesSessionOnlyEnabled(PrefServiceBridge caller);
++ void setCookiesSessionOnlyEnabled(PrefServiceBridge caller, boolean enabled);
+ boolean isContentSettingEnabled(PrefServiceBridge caller, int contentSettingType);
+ boolean isContentSettingManaged(PrefServiceBridge caller, int contentSettingType);
+ void setContentSettingEnabled(
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
@@ -93,15 +86,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
private static final String ADD_EXCEPTION_KEY = "add_exception";
-@@ -484,6 +485,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
- if (type == SiteSettingsCategory.Type.COOKIES
- && !FeatureUtilities.isNoTouchModeEnabled()) {
+@@ -477,6 +478,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+
+ if (type == SiteSettingsCategory.Type.COOKIES) {
updateThirdPartyCookiesCheckBox();
+ updateCookiesSessionOnlyCheckBox();
} else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
updateNotificationsVibrateCheckBox();
}
-@@ -523,6 +525,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -516,6 +518,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
int setting = (int) newValue;
prefServiceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
getInfoForOrigins();
@@ -110,7 +103,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
} else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
prefServiceBridge.setBlockThirdPartyCookiesEnabled(((boolean) newValue));
} else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
-@@ -840,6 +844,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -833,6 +837,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
TriStateSiteSettingsPreference triStateToggle =
(TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
@@ -119,7 +112,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
-@@ -871,6 +877,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -864,6 +870,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
if (hideSecondaryToggles) {
screen.removePreference(thirdPartyCookies);
@@ -127,15 +120,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
screen.removePreference(notificationsVibrate);
screen.removePreference(explainProtectedMediaKey);
screen.removePreference(allowedGroup);
-@@ -881,14 +888,17 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -874,12 +881,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
return;
}
- // Configure/hide the third-party cookies toggle, as needed.
+ // Configure/hide the third-party cookies toggle and session-only cookie toggle, as needed.
- // We don't need this toggle in touchless. Refer to crbug/951850.
- if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)
- && !FeatureUtilities.isNoTouchModeEnabled()) {
+ if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) {
thirdPartyCookies.setOnPreferenceChangeListener(this);
updateThirdPartyCookiesCheckBox();
+ cookiesSessionOnly.setOnPreferenceChangeListener(this);
@@ -146,7 +137,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
}
// Configure/hide the notifications vibrate toggle, as needed.
-@@ -1003,6 +1013,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -994,6 +1004,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
}
@@ -165,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -895,6 +895,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -878,6 +878,12 @@ Your Google account may have other forms of browsing history like searches and a
Prevent third-party websites from saving and reading cookie data
@@ -181,7 +172,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
-@@ -314,6 +314,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
+@@ -330,6 +330,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies);
}
@@ -199,7 +190,7 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged(
JNIEnv* env,
const JavaParamRef& obj) {
-@@ -785,6 +796,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
+@@ -801,6 +812,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
}
@@ -221,5 +212,5 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
JNIEnv* env,
const JavaParamRef& obj,
--
-2.11.0
+2.17.1
diff --git a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
index 3d66f7ad..f491f586 100644
--- a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
+++ b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
@@ -3,20 +3,20 @@ Date: Sat, 23 Nov 2019 10:55:16 +0100
Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL
---
- chrome/android/chrome_java_sources.gni | 2 +
- chrome/android/java/res/layout/doh_editor.xml | 65 ++++++++++++++++
- chrome/android/java/res/values/values.xml | 2 +
- chrome/android/java/res/xml/doh_preferences.xml | 25 ++++++
- .../android/java/res/xml/privacy_preferences.xml | 5 ++
- .../chrome/browser/preferences/DoHEditor.java | 91 ++++++++++++++++++++++
- .../chrome/browser/preferences/DoHPreferences.java | 52 +++++++++++++
- .../chrome/browser/util/FeatureUtilities.java | 25 ++++++
- .../java/strings/android_chrome_strings.grd | 11 +++
- chrome/app/generated_resources.grd | 6 ++
- chrome/browser/android/feature_utilities.cc | 23 ++++++
- .../browser/net/system_network_context_manager.cc | 46 +++--------
- chrome/common/chrome_features.cc | 4 +-
- 13 files changed, 320 insertions(+), 37 deletions(-)
+ chrome/android/chrome_java_sources.gni | 2 +
+ chrome/android/java/res/layout/doh_editor.xml | 65 +++++++++++++
+ chrome/android/java/res/values/values.xml | 2 +
+ .../android/java/res/xml/doh_preferences.xml | 25 +++++
+ .../java/res/xml/privacy_preferences.xml | 5 +
+ .../chrome/browser/preferences/DoHEditor.java | 91 +++++++++++++++++++
+ .../browser/preferences/DoHPreferences.java | 52 +++++++++++
+ .../chrome/browser/util/FeatureUtilities.java | 24 +++++
+ .../java/strings/android_chrome_strings.grd | 11 +++
+ chrome/app/generated_resources.grd | 6 ++
+ chrome/browser/android/feature_utilities.cc | 23 +++++
+ .../net/system_network_context_manager.cc | 46 +++-------
+ chrome/common/chrome_features.cc | 4 +-
+ 13 files changed, 319 insertions(+), 37 deletions(-)
create mode 100644 chrome/android/java/res/layout/doh_editor.xml
create mode 100644 chrome/android/java/res/xml/doh_preferences.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java
@@ -25,7 +25,7 @@ Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
-@@ -1251,7 +1251,9 @@ chrome_java_sources = [
+@@ -1263,7 +1263,9 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataCheckBoxPreference.java",
"java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java",
"java/src/org/chromium/chrome/browser/preferences/HomepageEditor.java",
@@ -108,7 +108,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
-@@ -88,6 +88,8 @@
+@@ -92,6 +92,8 @@
400
200
@@ -318,8 +318,8 @@ new file mode 100644
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-@@ -163,6 +163,27 @@ public class FeatureUtilities {
- nativeSetCustomTabVisible(visible);
+@@ -223,6 +223,26 @@ public class FeatureUtilities {
+ FeatureUtilitiesJni.get().setCustomTabVisible(visible);
}
+ /**
@@ -327,40 +327,39 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
+ * @param url Whether custom URL is enabled or not.
+ */
+ public static void setDoHEnabled(boolean enabled) {
-+ nativeSetDoHEnabled(enabled);
++ FeatureUtilitiesJni.get().setDoHEnabled(enabled);
+ }
+
+ public static boolean getDoHEnabled() {
-+ return nativeGetDoHEnabled();
++ return FeatureUtilitiesJni.get().getDoHEnabled();
+ }
+
+ public static void setDoHTemplates(String t) {
-+ nativeSetDoHTemplates(t);
++ FeatureUtilitiesJni.get().setDoHTemplates(t);
+ }
+
+ public static String getDoHTemplates() {
-+ return nativeGetDoHTemplates();
++ return FeatureUtilitiesJni.get().getDoHTemplates();
+ }
-+
+
/**
* Records whether the activity is in multi-window mode with native-side feature utilities.
* @param isInMultiWindowMode Whether the activity is in Android N multi-window mode.
-@@ -897,6 +918,10 @@ public class FeatureUtilities {
- }
-
- private static native void nativeSetCustomTabVisible(boolean visible);
-+ private static native void nativeSetDoHEnabled(boolean enabled);
-+ private static native boolean nativeGetDoHEnabled();
-+ private static native void nativeSetDoHTemplates(String templates);
-+ private static native String nativeGetDoHTemplates();
- private static native void nativeSetIsInMultiWindowMode(boolean isInMultiWindowMode);
- private static native boolean nativeIsNetworkServiceWarmUpEnabled();
- }
+@@ -852,6 +872,10 @@ public class FeatureUtilities {
+ interface Natives {
+ void setCustomTabVisible(boolean visible);
+ void setIsInMultiWindowMode(boolean isInMultiWindowMode);
++ void setDoHEnabled(boolean enabled);
++ boolean getDoHEnabled();
++ void setDoHTemplates(String templates);
++ String getDoHTemplates();
+ boolean isNetworkServiceWarmUpEnabled();
+ void setAdBlockFiltersURL(String url);
+ String getAdBlockFiltersURL();
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
-@@ -656,6 +656,17 @@ CHAR-LIMIT guidelines:
+@@ -644,6 +644,17 @@ CHAR-LIMIT guidelines:
Chrome Passwords
@@ -381,7 +380,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
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
-@@ -6507,6 +6507,12 @@ the Bookmarks menu.">
+@@ -6558,6 +6558,12 @@ the Bookmarks menu.">
Home page
@@ -407,7 +406,7 @@ diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/androi
#include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "components/ntp_snippets/content_suggestions_service.h"
-@@ -73,3 +76,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
+@@ -76,3 +79,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
return content::IsOutOfProcessNetworkService() &&
base::FeatureList::IsEnabled(features::kWarmUpNetworkProcess);
}
@@ -434,7 +433,7 @@ diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/androi
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -134,9 +134,14 @@ void GetStubResolverConfig(
+@@ -137,9 +137,14 @@ void GetStubResolverConfig(
std::string doh_templates =
local_state->GetString(prefs::kDnsOverHttpsTemplates);
@@ -452,7 +451,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
for (const std::string& server_template :
SplitString(doh_templates, " ", base::TRIM_WHITESPACE,
base::SPLIT_WANT_NONEMPTY)) {
-@@ -404,40 +409,11 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+@@ -425,40 +430,11 @@ SystemNetworkContextManager::SystemNetworkContextManager(
// features before registering change callbacks for these preferences.
local_state_->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled,
base::Value(ShouldEnableAsyncDns()));
@@ -499,7 +498,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
-@@ -271,12 +271,12 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
+@@ -294,12 +294,12 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
// Enable DNS over HTTPS (DoH).
const base::Feature kDnsOverHttps{"DnsOverHttps",
@@ -515,5 +514,5 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
// Supply one or more space-separated DoH server URI templates to use when this
// feature is enabled. If no templates are specified, then a hardcoded mapping
--
-2.11.0
+2.17.1
diff --git a/build/patches/Allow-building-without-feed-support.patch b/build/patches/Allow-building-without-feed-support.patch
new file mode 100644
index 00000000..88e09d24
--- /dev/null
+++ b/build/patches/Allow-building-without-feed-support.patch
@@ -0,0 +1,33 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 19 Dec 2019 22:52:53 +0100
+Subject: Allow building without feed support
+
+---
+ .../chrome/browser/ntp/cards/ExploreOfflineCard.java | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java
+@@ -13,7 +13,6 @@ import org.chromium.base.ApiCompatibilityUtils;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.download.DownloadUtils;
+-import org.chromium.chrome.browser.feed.FeedConfiguration;
+ import org.chromium.net.NetworkChangeNotifier;
+ import org.chromium.ui.text.SpanApplier;
+
+@@ -73,9 +72,7 @@ public class ExploreOfflineCard {
+
+ View imageView = cardView.findViewById(R.id.explore_offline_image);
+ imageView.setBackground(imageView.getContext().getResources().getDrawable(
+- FeedConfiguration.getFeedUiEnabled()
+- ? R.drawable.card_background_rounded_right_half_with_border
+- : R.drawable.card_background_rounded_right_half_no_border));
++ R.drawable.card_background_rounded_right_half_no_border));
+
+ cardView.setOnClickListener(v -> mOpenDownloadHomeCallback.run());
+ return cardView;
+--
+2.17.1
+
diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch
index f1cb5ed9..0b9ec7fb 100644
--- a/build/patches/Allow-playing-audio-in-background.patch
+++ b/build/patches/Allow-playing-audio-in-background.patch
@@ -10,7 +10,7 @@ Subject: Allow playing audio in background
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
-@@ -976,6 +976,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -989,6 +989,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
return pipeline_metadata_.has_audio;
}
@@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
void WebMediaPlayerImpl::EnabledAudioTracksChanged(
const blink::WebVector& enabledTrackIds) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3278,7 +3284,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3298,7 +3304,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
// Audio only stream is allowed to play when in background.
// TODO: We should check IsBackgroundOptimizationCandidate here. But we need
// to move the logic of checking video frames out of that function.
@@ -39,7 +39,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
-@@ -142,6 +142,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
+@@ -143,6 +143,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;
@@ -49,5 +49,5 @@ diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl
void EnabledAudioTracksChanged(
const blink::WebVector& enabledTrackIds)
--
-2.11.0
+2.17.1
diff --git a/build/patches/Allow-website-sign-in-without-account-sign-in.patch b/build/patches/Allow-website-sign-in-without-account-sign-in.patch
index a010e402..f21da40d 100644
--- a/build/patches/Allow-website-sign-in-without-account-sign-in.patch
+++ b/build/patches/Allow-website-sign-in-without-account-sign-in.patch
@@ -20,5 +20,5 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/
// static
--
-2.11.0
+2.17.1
diff --git a/build/patches/Always-allow-partner-customisation.patch b/build/patches/Always-allow-partner-customisation.patch
index 0780ac70..956143ca 100644
--- a/build/patches/Always-allow-partner-customisation.patch
+++ b/build/patches/Always-allow-partner-customisation.patch
@@ -3,13 +3,13 @@ Date: Thu, 14 Dec 2017 16:19:50 +0200
Subject: Always allow partner customisation
---
- .../PartnerBrowserCustomizations.java | 16 ++++++++--------
+ .../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 {
+@@ -244,14 +244,14 @@ public class PartnerBrowserCustomizations {
@Override
protected Void doInBackground() {
try {
@@ -33,5 +33,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
if (isCancelled()) return null;
refreshIncognitoModeDisabled();
--
-2.11.0
+2.17.1
diff --git a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch
index 0ac9ef74..22a91d50 100644
--- a/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch
+++ b/build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch
@@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -242,7 +242,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
+@@ -245,7 +245,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
// Android this includes checking the Android version in the field trial.
bool ShouldEnableAsyncDns() {
bool feature_can_be_enabled = true;
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
--- a/components/cronet/url_request_context_config.cc
+++ b/components/cronet/url_request_context_config.cc
-@@ -550,7 +550,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+@@ -573,7 +573,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
effective_experimental_options->Remove(it.key(), nullptr);
continue;
}
@@ -34,5 +34,5 @@ diff --git a/components/cronet/url_request_context_config.cc b/components/cronet
const base::DictionaryValue* stale_dns_args = nullptr;
if (!it.value().GetAsDictionary(&stale_dns_args)) {
--
-2.11.0
+2.17.1
diff --git a/build/patches/Always-show-home-page-settings.patch b/build/patches/Always-show-home-page-settings.patch
deleted file mode 100644
index 5b94c7b2..00000000
--- a/build/patches/Always-show-home-page-settings.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 17 Mar 2019 20:51:11 +0100
-Subject: Always show home page settings
-
-Remove the "Force Enable Home Page Button" flag, which was bugged, and always
-display home page settings.
-This allows removing the home page button and restoring it from settings.
----
- .../browser/init/ProcessInitializationHandler.java | 12 --------
- .../partnercustomizations/HomepageManager.java | 17 ++---------
- .../preferences/ChromePreferenceManager.java | 7 -----
- .../browser/preferences/MainPreferences.java | 12 +++-----
- .../chrome/browser/util/FeatureUtilities.java | 34 ----------------------
- chrome/browser/about_flags.cc | 3 --
- chrome/browser/android/chrome_feature_list.cc | 4 ---
- chrome/browser/android/chrome_feature_list.h | 1 -
- 8 files changed, 7 insertions(+), 83 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
-@@ -356,18 +356,6 @@ public class ProcessInitializationHandler {
- deferredStartupHandler.addDeferredTask(new Runnable() {
- @Override
- public void run() {
-- if (HomepageManager.shouldShowHomepageSetting()) {
-- RecordHistogram.recordBooleanHistogram("Settings.ShowHomeButtonPreferenceState",
-- HomepageManager.isHomepageEnabled());
-- RecordHistogram.recordBooleanHistogram("Settings.HomePageIsCustomized",
-- !HomepageManager.getInstance().getPrefHomepageUseDefaultUri());
-- }
-- }
-- });
--
-- deferredStartupHandler.addDeferredTask(new Runnable() {
-- @Override
-- public void run() {
- // Starts syncing with GSA.
- AppHooks.get().createGsaHelper().startSync();
- }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-@@ -83,10 +83,7 @@ public class HomepageManager {
- * @return Whether or not homepage is enabled.
- */
- public static boolean isHomepageEnabled() {
-- if (FeatureUtilities.isHomePageButtonForceEnabled()) {
-- return getInstance().getPrefHomepageEnabled();
-- }
-- return false;
-+ return getInstance().getPrefHomepageEnabled();
- }
-
- /**
-@@ -98,13 +95,6 @@ public class HomepageManager {
- }
-
- /**
-- * @return Whether or not homepage setting should be shown.
-- */
-- public static boolean shouldShowHomepageSetting() {
-- return FeatureUtilities.isHomePageButtonForceEnabled();
-- }
--
-- /**
- * @return Homepage URI string, if it's enabled. Null otherwise or uninitialized.
- */
- public static String getHomepageUri() {
-@@ -118,8 +108,7 @@ public class HomepageManager {
- }
-
- /**
-- * @return The default homepage URI if the homepage is partner provided or the new tab page
-- * if the homepage button is force enabled via flag.
-+ * @return The default homepage URI.
- */
- public static String getDefaultHomepageUri() {
- return UrlConstants.NTP_NON_NATIVE_URL;
-@@ -132,7 +121,7 @@ public class HomepageManager {
- * @see #isHomepageEnabled
- */
- public boolean getPrefHomepageEnabled() {
-- return mSharedPreferences.getBoolean(PREF_HOMEPAGE_ENABLED, true);
-+ return mSharedPreferences.getBoolean(PREF_HOMEPAGE_ENABLED, false);
- }
-
- /**
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
-@@ -154,13 +154,6 @@ public class ChromePreferenceManager {
- private static final String CHROME_MODERN_DESIGN_ENABLED_KEY = "chrome_modern_design_enabled";
-
- /**
-- * Whether or not the home page button is force enabled.
-- * Default value is false.
-- */
-- public static final String HOME_PAGE_BUTTON_FORCE_ENABLED_KEY =
-- "home_page_button_force_enabled";
--
-- /**
- * Whether or not the homepage tile will be shown.
- * Default value is false.
- */
-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
-@@ -206,15 +206,11 @@ public class MainPreferences extends PreferenceFragmentCompat
- updateSyncAndServicesPreference();
- updateSearchEnginePreference();
-
-- if (HomepageManager.shouldShowHomepageSetting()) {
-- Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
-- if (FeatureUtilities.isNewTabPageButtonEnabled()) {
-- homepagePref.setTitle(R.string.options_startup_page_title);
-- }
-- setOnOffSummary(homepagePref, HomepageManager.getInstance().getPrefHomepageEnabled());
-- } else {
-- removePreferenceIfPresent(PREF_HOMEPAGE);
-+ Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
-+ if (FeatureUtilities.isNewTabPageButtonEnabled()) {
-+ homepagePref.setTitle(R.string.options_startup_page_title);
- }
-+ setOnOffSummary(homepagePref, HomepageManager.getInstance().getPrefHomepageEnabled());
-
- if (NightModeUtils.isNightModeSupported() && FeatureUtilities.isNightModeAvailable()) {
- addPreferenceIfAbsent(PREF_UI_THEME);
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-@@ -73,7 +73,6 @@ public class FeatureUtilities {
- private static Boolean sHasGoogleAccountAuthenticator;
- private static Boolean sHasRecognitionIntentHandler;
-
-- private static Boolean sIsHomePageButtonForceEnabled;
- private static Boolean sIsHomepageTileEnabled;
- private static Boolean sIsNewTabPageButtonEnabled;
- private static Boolean sIsBottomToolbarEnabled;
-@@ -178,7 +177,6 @@ public class FeatureUtilities {
- public static void cacheNativeFlags() {
- cacheCommandLineOnNonRootedEnabled();
- FirstRunUtils.cacheFirstRunPrefs();
-- cacheHomePageButtonForceEnabled();
- cacheHomepageTileEnabled();
- cacheNewTabPageButtonEnabled();
- cacheBottomToolbarEnabled();
-@@ -228,38 +226,6 @@ public class FeatureUtilities {
- return Build.VERSION.SDK_INT > Build.VERSION_CODES.M;
- }
-
-- /**
-- * Cache whether or not the home page button is force enabled so on next startup, the value can
-- * be made available immediately.
-- */
-- public static void cacheHomePageButtonForceEnabled() {
-- if (PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()) return;
-- ChromePreferenceManager.getInstance().writeBoolean(
-- ChromePreferenceManager.HOME_PAGE_BUTTON_FORCE_ENABLED_KEY,
-- ChromeFeatureList.isEnabled(ChromeFeatureList.HOME_PAGE_BUTTON_FORCE_ENABLED));
-- }
--
-- /**
-- * @return Whether or not the home page button is force enabled.
-- */
-- public static boolean isHomePageButtonForceEnabled() {
-- if (sIsHomePageButtonForceEnabled == null) {
-- ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance();
--
-- sIsHomePageButtonForceEnabled = prefManager.readBoolean(
-- ChromePreferenceManager.HOME_PAGE_BUTTON_FORCE_ENABLED_KEY, false);
-- }
-- return sIsHomePageButtonForceEnabled;
-- }
--
-- /**
-- * Resets whether the home page button is enabled for tests. After this is called, the next
-- * call to #isHomePageButtonForceEnabled() will retrieve the value from shared preferences.
-- */
-- public static void resetHomePageButtonForceEnabledForTests() {
-- sIsHomePageButtonForceEnabled = null;
-- }
--
- private static void cacheServiceManagerForDownloadResumption() {
- boolean resumptionDownloadInReducedMode =
- ChromeFeatureList.isEnabled(ChromeFeatureList.SERVICE_MANAGER_FOR_DOWNLOAD);
-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
-@@ -1932,9 +1932,6 @@ const FeatureEntry kFeatureEntries[] = {
- {"enable-chrome-duet-labels", flag_descriptions::kChromeDuetLabelsName,
- flag_descriptions::kChromeDuetLabelsDescription, kOsAndroid,
- FEATURE_VALUE_TYPE(chrome::android::kChromeDuetLabeled)},
-- {"force-enable-home-page-button", flag_descriptions::kHomePageButtonName,
-- flag_descriptions::kHomePageButtonDescription, kOsAndroid,
-- FEATURE_VALUE_TYPE(chrome::android::kHomePageButtonForceEnabled)},
- {"enable-ntp-button", flag_descriptions::kNtpButtonName,
- flag_descriptions::kNtpButtonDescription, kOsAndroid,
- FEATURE_VALUE_TYPE(chrome::android::kNTPButton)},
-diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
---- a/chrome/browser/android/chrome_feature_list.cc
-+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -143,7 +143,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
- &kEphemeralTab,
- &kExploreSites,
- &kHandleMediaIntents,
-- &kHomePageButtonForceEnabled,
- &kHomepageTile,
- &kHorizontalTabSwitcherAndroid,
- &kIdentityDisc,
-@@ -439,9 +438,6 @@ const base::Feature kForegroundNotificationManager{
- const base::Feature kHandleMediaIntents{"HandleMediaIntents",
- base::FEATURE_ENABLED_BY_DEFAULT};
-
--const base::Feature kHomePageButtonForceEnabled{
-- "HomePageButtonForceEnabled", base::FEATURE_DISABLED_BY_DEFAULT};
--
- const base::Feature kHomepageTile{"HomepageTile",
- base::FEATURE_ENABLED_BY_DEFAULT};
-
-diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
---- a/chrome/browser/android/chrome_feature_list.h
-+++ b/chrome/browser/android/chrome_feature_list.h
-@@ -77,7 +77,6 @@ extern const base::Feature kEphemeralTab;
- extern const base::Feature kExploreSites;
- extern const base::Feature kForegroundNotificationManager;
- extern const base::Feature kHandleMediaIntents;
--extern const base::Feature kHomePageButtonForceEnabled;
- extern const base::Feature kHomepageTile;
- extern const base::Feature kHorizontalTabSwitcherAndroid;
- extern const base::Feature kIdentityDisc;
---
-2.11.0
-
diff --git a/build/patches/Always-use-new-tab-page-for-default-home-page.patch b/build/patches/Always-use-new-tab-page-for-default-home-page.patch
index b4a4ac73..df1968b2 100644
--- a/build/patches/Always-use-new-tab-page-for-default-home-page.patch
+++ b/build/patches/Always-use-new-tab-page-for-default-home-page.patch
@@ -4,33 +4,13 @@ Subject: Always use new tab page for default home page
Ignore any partner-provided home page.
---
- .../chrome/browser/partnercustomizations/HomepageManager.java | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
+ .../chrome/browser/partnercustomizations/HomepageManager.java | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-@@ -83,8 +83,7 @@ public class HomepageManager {
- * @return Whether or not homepage is enabled.
- */
- public static boolean isHomepageEnabled() {
-- if (PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()
-- || FeatureUtilities.isHomePageButtonForceEnabled()) {
-+ if (FeatureUtilities.isHomePageButtonForceEnabled()) {
- return getInstance().getPrefHomepageEnabled();
- }
- return false;
-@@ -102,8 +101,7 @@ public class HomepageManager {
- * @return Whether or not homepage setting should be shown.
- */
- public static boolean shouldShowHomepageSetting() {
-- return PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()
-- || FeatureUtilities.isHomePageButtonForceEnabled();
-+ return FeatureUtilities.isHomePageButtonForceEnabled();
- }
-
- /**
-@@ -124,9 +122,7 @@ public class HomepageManager {
+@@ -111,9 +111,7 @@ public class HomepageManager {
* if the homepage button is force enabled via flag.
*/
public static String getDefaultHomepageUri() {
@@ -42,5 +22,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
/**
--
-2.11.0
+2.17.1
diff --git a/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch b/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch
index 6a7fb9db..aced69fb 100644
--- a/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch
+++ b/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch
@@ -2,12 +2,12 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sun, 25 Mar 2018 21:49:37 +0200
Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL
-Return fixed base latency
+Truncate base latency precision to two digits
---
- 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 | 1 +
- 3 files changed, 7 insertions(+), 6 deletions(-)
+ .../blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++----
+ .../blink/renderer/modules/webaudio/audio_buffer.idl | 4 ++--
+ .../blink/renderer/modules/webaudio/audio_context.cc | 4 +++-
+ 3 files changed, 9 insertions(+), 7 deletions(-)
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
@@ -43,14 +43,17 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
--- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -358,6 +358,7 @@ void AudioContext::StopRendering() {
- double AudioContext::baseLatency() const {
+@@ -373,7 +373,9 @@ double AudioContext::baseLatency() const {
DCHECK(IsMainThread());
DCHECK(destination());
-+ return 0.04;
- // TODO(hongchan): Due to the incompatible constructor between
- // AudioDestinationNode and RealtimeAudioDestinationNode, casting directly
+- return base_latency_;
++ // remove precision past two decimal digits
++ int l = base_latency_ * 100;
++ return double(l)/100;
+ }
+
+ MediaElementAudioSourceNode* AudioContext::createMediaElementSource(
--
-2.11.0
+2.17.1
diff --git a/build/patches/Battery-API-return-nothing.patch b/build/patches/Battery-API-return-nothing.patch
index fbd5e4c5..e7c0197e 100644
--- a/build/patches/Battery-API-return-nothing.patch
+++ b/build/patches/Battery-API-return-nothing.patch
@@ -4,7 +4,7 @@ Subject: Battery API: return nothing
Include @thestinger's fix for correct charging/unknown values
---
- .../renderer/modules/battery/battery_manager.cc | 25 ++++------------------
+ .../modules/battery/battery_manager.cc | 25 +++----------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -61,5 +61,5 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
void BatteryManager::RegisterWithDispatcher() {
--
-2.11.0
+2.17.1
diff --git a/build/patches/Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch b/build/patches/Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch
index 91ed7032..f59cf597 100644
--- a/build/patches/Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch
+++ b/build/patches/Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch
@@ -6,21 +6,21 @@ Subject: Block all connection requests with 'qjz9zk' in the domain name or
An info bar is displayed unless the --disable-trkbar command-line flag or the chrome://flag option is used.
This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
---
- .../chrome_autocomplete_scheme_classifier.cc | 1 +
- chrome/browser/history/history_utils.cc | 1 +
- chrome/browser/ui/singleton_tabs.cc | 3 +-
- chromecast/browser/url_request_context_factory.cc | 7 ++++-
- components/omnibox/browser/autocomplete_input.cc | 7 +++--
- components/url_formatter/url_fixer.cc | 4 +++
- .../browser/child_process_security_policy_impl.cc | 1 +
- net/BUILD.gn | 2 ++
- net/url_request/trk_protocol_handler.cc | 26 +++++++++++++++++
- net/url_request/trk_protocol_handler.h | 33 ++++++++++++++++++++++
- net/url_request/url_request.cc | 8 ++++++
- net/url_request/url_request_context_builder.cc | 4 +++
- url/url_constants.cc | 1 +
- url/url_constants.h | 1 +
- url/url_util.cc | 2 ++
+ .../chrome_autocomplete_scheme_classifier.cc | 1 +
+ chrome/browser/history/history_utils.cc | 1 +
+ chrome/browser/ui/singleton_tabs.cc | 3 +-
+ .../browser/url_request_context_factory.cc | 7 +++-
+ .../omnibox/browser/autocomplete_input.cc | 7 ++--
+ components/url_formatter/url_fixer.cc | 4 +++
+ .../child_process_security_policy_impl.cc | 1 +
+ net/BUILD.gn | 2 ++
+ net/url_request/trk_protocol_handler.cc | 26 +++++++++++++++
+ net/url_request/trk_protocol_handler.h | 33 +++++++++++++++++++
+ net/url_request/url_request.cc | 8 +++++
+ .../url_request_context_builder.cc | 4 +++
+ url/url_constants.cc | 1 +
+ url/url_constants.h | 1 +
+ url/url_util.cc | 2 ++
15 files changed, 97 insertions(+), 4 deletions(-)
create mode 100644 net/url_request/trk_protocol_handler.cc
create mode 100644 net/url_request/trk_protocol_handler.h
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/hi
diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+@@ -100,7 +100,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
// Skip view-source tabs. This is needed because RewriteURLIfNecessary
// removes the "view-source:" scheme which leads to incorrect matching.
@@ -131,7 +131,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
-@@ -507,6 +507,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
+@@ -513,6 +513,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
RegisterWebSafeScheme(url::kHttpsScheme);
RegisterWebSafeScheme(url::kFtpScheme);
RegisterWebSafeScheme(url::kDataScheme);
@@ -142,7 +142,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
-@@ -1787,6 +1787,8 @@ component("net") {
+@@ -1801,6 +1801,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -223,7 +223,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
-@@ -15,6 +15,7 @@
+@@ -13,6 +13,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
@@ -231,7 +231,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_task_runner_handle.h"
-@@ -42,6 +43,7 @@
+@@ -40,6 +41,7 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -239,7 +239,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
using base::Time;
using std::string;
-@@ -612,6 +614,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -592,6 +594,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -264,15 +264,15 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
@@ -641,6 +642,9 @@ std::unique_ptr URLRequestContextBuilder::Build() {
- job_factory->SetProtocolHandler(url::kDataScheme,
- std::make_unique());
-
+ }
+ url_request_interceptors_.clear();
+ }
+ job_factory->SetProtocolHandler(url::kTraceScheme,
+ std::make_unique());
+
- #if !BUILDFLAG(DISABLE_FILE_SUPPORT)
- if (file_enabled_) {
- job_factory->SetProtocolHandler(
+ if (create_intercepting_job_factory_) {
+ top_job_factory = std::move(create_intercepting_job_factory_)
+ .Run(std::move(top_job_factory));
diff --git a/url/url_constants.cc b/url/url_constants.cc
--- a/url/url_constants.cc
+++ b/url/url_constants.cc
@@ -315,5 +315,5 @@ diff --git a/url/url_util.cc b/url/url_util.cc
// Schemes that can be sent CORS requests.
--
-2.11.0
+2.17.1
diff --git a/build/patches/Bromite-AdBlockUpdaterService.patch b/build/patches/Bromite-AdBlockUpdaterService.patch
index 97061691..bc5bc0d5 100644
--- a/build/patches/Bromite-AdBlockUpdaterService.patch
+++ b/build/patches/Bromite-AdBlockUpdaterService.patch
@@ -7,36 +7,63 @@ Do not use experiments to enable/disable presets
Always enable ad filtering
Download filters by checking Last-Modified header first
---
- chrome/browser/after_startup_task_utils.cc | 5 +
- chrome/browser/browser_process.h | 7 +
- chrome/browser/browser_process_impl.cc | 28 +++
- chrome/browser/browser_process_impl.h | 3 +
- chrome/browser/chrome_browser_main.cc | 5 +-
- chrome/browser/chrome_content_browser_client.cc | 18 --
- components/component_updater/BUILD.gn | 6 +
- .../component_updater/adblock_updater_service.cc | 249 +++++++++++++++++++++
- .../component_updater/adblock_updater_service.h | 99 ++++++++
- .../component_updater/download_filters_task.cc | 228 +++++++++++++++++++
- .../component_updater/download_filters_task.h | 131 +++++++++++
- .../content_subresource_filter_throttle_manager.cc | 11 +
- .../content/browser/ruleset_service.cc | 33 ++-
- .../content/browser/ruleset_service.h | 7 +-
- .../content/browser/ruleset_version.cc | 1 +
- .../content/browser/ruleset_version.h | 5 +
- .../content/browser/verified_ruleset_dealer.cc | 2 +
- .../core/browser/subresource_filter_features.cc | 113 +---------
- .../core/common/common_features.cc | 2 +-
- .../frame_host/navigation_throttle_runner.cc | 10 -
- 20 files changed, 817 insertions(+), 146 deletions(-)
+ .../chrome/browser/util/FeatureUtilities.java | 10 +
+ chrome/browser/after_startup_task_utils.cc | 5 +
+ chrome/browser/browser_process.h | 7 +
+ chrome/browser/browser_process_impl.cc | 28 ++
+ chrome/browser/browser_process_impl.h | 3 +
+ chrome/browser/chrome_browser_main.cc | 5 +-
+ .../browser/chrome_content_browser_client.cc | 17 --
+ components/component_updater/BUILD.gn | 6 +
+ .../adblock_updater_service.cc | 249 ++++++++++++++++++
+ .../adblock_updater_service.h | 99 +++++++
+ .../download_filters_task.cc | 228 ++++++++++++++++
+ .../component_updater/download_filters_task.h | 131 +++++++++
+ ...ent_subresource_filter_throttle_manager.cc | 11 +
+ .../content/browser/ruleset_service.cc | 33 ++-
+ .../content/browser/ruleset_service.h | 7 +-
+ .../content/browser/ruleset_version.cc | 1 +
+ .../content/browser/ruleset_version.h | 5 +
+ .../browser/verified_ruleset_dealer.cc | 2 +
+ .../browser/subresource_filter_features.cc | 113 +-------
+ .../core/common/common_features.cc | 2 +-
+ .../frame_host/navigation_throttle_runner.cc | 10 -
+ 21 files changed, 827 insertions(+), 145 deletions(-)
create mode 100644 components/component_updater/adblock_updater_service.cc
create mode 100644 components/component_updater/adblock_updater_service.h
create mode 100644 components/component_updater/download_filters_task.cc
create mode 100644 components/component_updater/download_filters_task.h
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+@@ -277,6 +277,14 @@ public class FeatureUtilities {
+ cacheServiceManagerForBackgroundPrefetch();
+ }
+
++ public static void setAdBlockFiltersURL(String url) {
++ FeatureUtilitiesJni.get().setAdBlockFiltersURL(url);
++ }
++
++ public static String getAdBlockFiltersURL() {
++ return FeatureUtilitiesJni.get().getAdBlockFiltersURL();
++ }
++
+ /**
+ * @return True if tab model merging for Android N+ is enabled.
+ */
+@@ -845,5 +853,7 @@ public class FeatureUtilities {
+ void setCustomTabVisible(boolean visible);
+ void setIsInMultiWindowMode(boolean isInMultiWindowMode);
+ boolean isNetworkServiceWarmUpEnabled();
++ void setAdBlockFiltersURL(String url);
++ String getAdBlockFiltersURL();
+ }
+ }
diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
--- a/chrome/browser/after_startup_task_utils.cc
+++ b/chrome/browser/after_startup_task_utils.cc
-@@ -36,6 +36,8 @@
+@@ -37,6 +37,8 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -45,7 +72,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
using content::BrowserThread;
using content::WebContents;
using content::WebContentsObserver;
-@@ -135,6 +137,9 @@ void SetBrowserStartupIsComplete() {
+@@ -136,6 +138,9 @@ void SetBrowserStartupIsComplete() {
g_after_startup_tasks.Get().clear();
g_after_startup_tasks.Get().shrink_to_fit();
@@ -58,14 +85,14 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
-@@ -22,6 +22,7 @@
- #include "chrome/browser/shell_integration.h"
+@@ -21,6 +21,7 @@
+ #include "build/build_config.h"
#include "chrome/common/buildflags.h"
#include "media/media_buildflags.h"
+#include "components/component_updater/adblock_updater_service.h"
class BackgroundModeManager;
- class DownloadRequestLimiter;
+ class BrowserProcessPlatformPart;
@@ -58,6 +59,10 @@ class ComponentUpdateService;
class SupervisedUserWhitelistInstaller;
}
@@ -89,7 +116,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
-@@ -1009,6 +1009,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1005,6 +1005,34 @@ BrowserProcessImpl::component_updater() {
return component_updater_.get();
}
@@ -135,7 +162,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
component_updater::SupervisedUserWhitelistInstaller*
supervised_user_whitelist_installer() override;
-@@ -361,6 +362,8 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -357,6 +358,8 @@ class BrowserProcessImpl : public BrowserProcess,
// but some users of component updater only install per-user.
std::unique_ptr component_updater_;
@@ -147,7 +174,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
-@@ -1722,8 +1722,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1715,8 +1715,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
PreBrowserStart();
@@ -163,7 +190,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/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
-@@ -65,7 +65,6 @@
+@@ -63,7 +63,6 @@
#include "chrome/browser/hid/chrome_hid_delegate.h"
#include "chrome/browser/language/translate_frame_binder.h"
#include "chrome/browser/lifetime/browser_shutdown.h"
@@ -171,15 +198,15 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/media/router/presentation/presentation_service_delegate_impl.h"
#include "chrome/browser/media/router/presentation/receiver_presentation_service_delegate_impl.h"
-@@ -81,7 +80,6 @@
- #include "chrome/browser/net_benchmarking.h"
- #include "chrome/browser/notifications/platform_notification_service_factory.h"
- #include "chrome/browser/notifications/platform_notification_service_impl.h"
--#include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h"
- #include "chrome/browser/page_load_metrics/metrics_web_contents_observer.h"
- #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
- #include "chrome/browser/password_manager/chrome_password_manager_client.h"
-@@ -4044,16 +4042,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -207,7 +206,6 @@
+ #include "components/nacl/common/buildflags.h"
+ #include "components/nacl/common/nacl_constants.h"
+ #include "components/net_log/chrome_net_log.h"
+-#include "components/page_load_metrics/browser/metrics_navigation_throttle.h"
+ #include "components/page_load_metrics/browser/metrics_web_contents_observer.h"
+ #include "components/page_load_metrics/browser/page_load_metrics_util.h"
+ #include "components/payments/content/payment_request_display_manager.h"
+@@ -3798,16 +3796,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
content::NavigationHandle* handle) {
std::vector> throttles;
@@ -194,21 +221,20 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
- }
-
#if BUILDFLAG(ENABLE_PLUGINS)
- std::unique_ptr flash_url_throttle =
- FlashDownloadInterception::MaybeCreateThrottleFor(handle);
-@@ -4163,12 +4151,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
- }
+ MaybeAddThrottle(&throttles,
+ FlashDownloadInterception::MaybeCreateThrottleFor(handle));
+@@ -3914,11 +3902,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+ safe_browsing::MaybeCreateNavigationThrottle(handle));
#endif
-- std::unique_ptr
-- lookalike_url_navigation_throttle = lookalikes::
-- LookalikeUrlNavigationThrottle::MaybeCreateNavigationThrottle(handle);
-- if (lookalike_url_navigation_throttle)
-- throttles.push_back(std::move(lookalike_url_navigation_throttle));
+- MaybeAddThrottle(
+- &throttles,
+- lookalikes::LookalikeUrlNavigationThrottle::MaybeCreateNavigationThrottle(
+- handle));
-
- std::unique_ptr pdf_iframe_throttle =
- PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle);
- if (pdf_iframe_throttle)
+ MaybeAddThrottle(&throttles,
+ PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle));
+
diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn
--- a/components/component_updater/BUILD.gn
+++ b/components/component_updater/BUILD.gn
@@ -269,7 +295,7 @@ new file mode 100644
+#include "url/gurl.h"
+#include "base/strings/safe_sprintf.h"
+#include "base/strings/string_number_conversions.h"
-+
++#include "base/strings/string_split.h"
+namespace adblock_updater {
+
+// all constants express seconds
@@ -743,7 +769,7 @@ new file mode 100644
+
+void DownloadFiltersTask::OnResponseStarted(
+ const GURL& final_url,
-+ const network::ResourceResponseHead& response_head) {
++ const network::mojom::URLResponseHead& response_head) {
+
+ final_url_ = final_url;
+ response_code_ = response_head.headers ? response_head.headers->response_code() : -1;
@@ -920,7 +946,7 @@ new file mode 100644
+
+ void OnDownloadProgress(uint64_t current);
+ void OnResponseStarted(const GURL& final_url,
-+ const network::ResourceResponseHead& response_head);
++ const network::mojom::URLResponseHead& response_head);
+ void OnDownloadComplete(base::FilePath file_path,
+ int net_error,
+ int64_t content_size);
@@ -955,7 +981,7 @@ new file mode 100644
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
--- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
-@@ -308,6 +308,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -306,6 +306,17 @@ ContentSubresourceFilterThrottleManager::
throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
ad_tagging_state);
}
@@ -1325,16 +1351,16 @@ diff --git a/content/browser/frame_host/navigation_throttle_runner.cc b/content/
#include "content/browser/frame_host/form_submission_throttle.h"
-#include "content/browser/frame_host/history_navigation_ablation_study_navigation_throttle.h"
#include "content/browser/frame_host/mixed_content_navigation_throttle.h"
- #include "content/browser/frame_host/navigation_handle_impl.h"
+ #include "content/browser/frame_host/navigation_request.h"
#include "content/browser/frame_host/navigator_delegate.h"
@@ -120,15 +119,6 @@ void NavigationThrottleRunner::RegisterNavigationThrottles() {
- devtools_instrumentation::CreateNavigationThrottles(handle)) {
+ devtools_instrumentation::CreateNavigationThrottles(handle_)) {
AddThrottle(std::move(throttle));
}
-
- // Delay navigation for an ablation study (if needed).
- AddThrottle(HistoryNavigationAblationStudyNavigationThrottle::
-- MaybeCreateForNavigation(handle));
+- MaybeCreateForNavigation(handle_));
-
- // Insert all testing NavigationThrottles last.
- throttles_.insert(throttles_.end(),
@@ -1344,5 +1370,5 @@ diff --git a/content/browser/frame_host/navigation_throttle_runner.cc b/content/
NavigationThrottle* NavigationThrottleRunner::GetDeferringThrottle() const {
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-HEAD-requests-for-single-word-Omnibar-searches.patch b/build/patches/Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
index 3d03ddda..92e42f77 100644
--- a/build/patches/Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
+++ b/build/patches/Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
@@ -4,14 +4,14 @@ Subject: Disable HEAD requests for single-word Omnibar searches
Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526873727
---
- chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc | 8 ++++----
- chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h | 2 +-
+ .../ui/omnibox/chrome_omnibox_navigation_observer.cc | 8 ++++----
+ .../ui/omnibox/chrome_omnibox_navigation_observer.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
-@@ -85,8 +85,8 @@ ChromeOmniboxNavigationObserver::ChromeOmniboxNavigationObserver(
+@@ -86,8 +86,8 @@ ChromeOmniboxNavigationObserver::ChromeOmniboxNavigationObserver(
shortcuts_backend_(ShortcutsBackendFactory::GetForProfile(profile)),
load_state_(LOAD_NOT_SEEN),
fetch_state_(FETCH_NOT_COMPLETE) {
@@ -22,7 +22,7 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/c
// We need to start by listening to AllSources, since we don't know which tab
// the navigation might occur in.
-@@ -286,7 +286,7 @@ void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
+@@ -287,7 +287,7 @@ void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
delete this;
}
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/c
const GURL& destination_url) {
net::NetworkTrafficAnnotationTag traffic_annotation =
net::DefineNetworkTrafficAnnotation("omnibox_navigation_observer", R"(
-@@ -327,4 +327,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
+@@ -328,4 +328,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
loader_->SetAllowHttpErrorResults(true);
loader_->SetOnRedirectCallback(base::BindRepeating(
&ChromeOmniboxNavigationObserver::OnURLRedirect, base::Unretained(this)));
@@ -50,5 +50,5 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h b/ch
const base::string16 text_;
const AutocompleteMatch match_;
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-NTP-remote-suggestions-by-default.patch b/build/patches/Disable-NTP-remote-suggestions-by-default.patch
index 13346035..fb2f115f 100644
--- a/build/patches/Disable-NTP-remote-suggestions-by-default.patch
+++ b/build/patches/Disable-NTP-remote-suggestions-by-default.patch
@@ -3,8 +3,9 @@ Date: Thu, 12 Oct 2017 08:15:17 +0200
Subject: Disable NTP remote suggestions by default
---
- components/ntp_snippets/features.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ components/ntp_snippets/features.cc | 4 ++--
+ .../remote/remote_suggestions_status_service_impl.cc | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
--- a/components/ntp_snippets/features.cc
@@ -27,6 +28,20 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
const base::Feature kOptionalImagesEnabledFeature{
"NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
+diff --git a/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc b/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
+--- a/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
++++ b/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
+@@ -36,8 +36,8 @@ RemoteSuggestionsStatusServiceImpl::~RemoteSuggestionsStatusServiceImpl() =
+ // static
+ void RemoteSuggestionsStatusServiceImpl::RegisterProfilePrefs(
+ PrefRegistrySimple* registry) {
+- registry->RegisterBooleanPref(prefs::kEnableSnippets, true);
+- registry->RegisterBooleanPref(prefs::kArticlesListVisible, true);
++ registry->RegisterBooleanPref(prefs::kEnableSnippets, false);
++ registry->RegisterBooleanPref(prefs::kArticlesListVisible, false);
+ }
+
+ void RemoteSuggestionsStatusServiceImpl::Init(
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-Omaha-update-checks.patch b/build/patches/Disable-Omaha-update-checks.patch
index 8b9363e6..f0014bb6 100644
--- a/build/patches/Disable-Omaha-update-checks.patch
+++ b/build/patches/Disable-Omaha-update-checks.patch
@@ -4,15 +4,15 @@ Subject: Disable Omaha update checks
Do not consider Jelly Bean unsupported
---
- .../android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java | 2 +-
- .../java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java | 2 +-
- chrome/browser/android/chrome_feature_list.cc | 2 +-
+ .../java/src/org/chromium/chrome/browser/omaha/OmahaBase.java | 2 +-
+ .../org/chromium/chrome/browser/omaha/VersionNumberGetter.java | 2 +-
+ chrome/browser/android/chrome_feature_list.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-@@ -135,7 +135,7 @@ public class OmahaBase {
+@@ -136,7 +136,7 @@ public class OmahaBase {
/** See {@link #sIsDisabled}. */
static boolean isDisabled() {
@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNu
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -465,7 +465,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
+@@ -458,7 +458,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kJellyBeanSupported{"JellyBeanSupported",
@@ -46,5 +46,5 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
const base::Feature kSearchEnginePromoExistingDevice{
"SearchEnginePromo.ExistingDevice", base::FEATURE_ENABLED_BY_DEFAULT};
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-WebRTC-by-default.patch b/build/patches/Disable-WebRTC-by-default.patch
index 30ecb875..e5ce1a2e 100644
--- a/build/patches/Disable-WebRTC-by-default.patch
+++ b/build/patches/Disable-WebRTC-by-default.patch
@@ -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
-@@ -82,10 +82,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -83,10 +83,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
false);
#endif
// TODO(guoweis): Remove next 2 options at M50.
@@ -18,11 +18,11 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
+ registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, false);
+ registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, false);
registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
-- content::kWebRTCIPHandlingDefault);
-+ content::kWebRTCIPHandlingDisableNonProxiedUdp);
+- blink::kWebRTCIPHandlingDefault);
++ blink::kWebRTCIPHandlingDisableNonProxiedUdp);
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
-
+ registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-addresses-autofill-by-default.patch b/build/patches/Disable-addresses-autofill-by-default.patch
new file mode 100644
index 00000000..b7651341
--- /dev/null
+++ b/build/patches/Disable-addresses-autofill-by-default.patch
@@ -0,0 +1,36 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 19 Dec 2019 21:46:10 +0100
+Subject: Disable addresses autofill by default
+
+---
+ .../autofill_assistant/AutofillAssistantPreferencesUtil.java | 2 +-
+ .../autofill_assistant/AutofillAssistantPreferences.java | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+--- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
++++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+@@ -25,7 +25,7 @@ class AutofillAssistantPreferencesUtil {
+ /** Checks whether the Autofill Assistant switch preference in settings is on. */
+ static boolean isAutofillAssistantSwitchOn() {
+ return ContextUtils.getAppSharedPreferences().getBoolean(
+- AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, true);
++ AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, false);
+ }
+
+ /** Checks whether the Autofill Assistant onboarding has been accepted. */
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
+@@ -48,7 +48,7 @@ public class AutofillAssistantPreferences extends PreferenceFragmentCompat {
+ // (e.g. the switch will say "On" when it is really turned off), so .setChecked() should be
+ // called after .addPreference()
+ autofillAssistantSwitch.setChecked(ContextUtils.getAppSharedPreferences().getBoolean(
+- PREF_AUTOFILL_ASSISTANT_SWITCH, true));
++ PREF_AUTOFILL_ASSISTANT_SWITCH, false));
+ }
+
+ private Context getStyledContext() {
+--
+2.17.1
+
diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch
index da50411b..f078745c 100644
--- a/build/patches/Disable-all-promo-dialogs.patch
+++ b/build/patches/Disable-all-promo-dialogs.patch
@@ -3,13 +3,13 @@ Date: Tue, 12 Jun 2018 15:09:26 +0200
Subject: Disable all promo dialogs
---
- .../chrome/browser/ChromeTabbedActivity.java | 30 +---------------------
+ .../chrome/browser/ChromeTabbedActivity.java | 30 +------------------
1 file changed, 1 insertion(+), 29 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
-@@ -799,35 +799,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+@@ -801,35 +801,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
try (TraceEvent e = TraceEvent.scoped(
"ChromeTabbedActivity.createToolbarButtonInProductHelpController")) {
ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();
@@ -47,5 +47,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-contextual-search-by-default.patch b/build/patches/Disable-contextual-search-by-default.patch
index 2a13838f..4316f499 100644
--- a/build/patches/Disable-contextual-search-by-default.patch
+++ b/build/patches/Disable-contextual-search-by-default.patch
@@ -4,14 +4,14 @@ Subject: Disable contextual search by default
Disable contextual search in preference by default
---
- .../src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java | 2 +-
- chrome/browser/profiles/profile.cc | 2 +-
+ .../chromium/chrome/browser/preferences/PrefServiceBridge.java | 2 +-
+ chrome/browser/profiles/profile.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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
-@@ -423,7 +423,7 @@ public class PrefServiceBridge {
+@@ -449,7 +449,7 @@ public class PrefServiceBridge {
* @return Whether the Contextual Search feature was disabled by the user explicitly.
*/
public boolean isContextualSearchDisabled() {
@@ -23,7 +23,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
-@@ -145,7 +145,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -154,7 +154,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
#if defined(OS_ANDROID)
registry->RegisterStringPref(
prefs::kContextualSearchEnabled,
@@ -33,5 +33,5 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
#endif // defined(OS_ANDROID)
registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-dynamic-module-loading.patch b/build/patches/Disable-dynamic-module-loading.patch
index 3d81b21e..68f261e8 100644
--- a/build/patches/Disable-dynamic-module-loading.patch
+++ b/build/patches/Disable-dynamic-module-loading.patch
@@ -3,17 +3,17 @@ Date: Mon, 20 May 2019 23:14:36 +0200
Subject: Disable dynamic module loading
---
- chrome/android/chrome_java_sources.gni | 13 ----------
- .../browser/customtabs/CustomTabActivity.java | 18 -------------
- .../customtabs/CustomTabIntentDataProvider.java | 17 ++----------
- .../browser/customtabs/CustomTabsConnection.java | 30 ----------------------
- .../CustomTabActivityComponent.java | 4 ---
+ chrome/android/chrome_java_sources.gni | 13 --------
+ .../browser/customtabs/CustomTabActivity.java | 18 -----------
+ .../CustomTabIntentDataProvider.java | 17 ++---------
+ .../customtabs/CustomTabsConnection.java | 30 -------------------
+ .../CustomTabActivityComponent.java | 4 ---
5 files changed, 2 insertions(+), 80 deletions(-)
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
-@@ -418,19 +418,6 @@ chrome_java_sources = [
+@@ -426,19 +426,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/customtabs/content/TabCreationMode.java",
"java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java",
"java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityModule.java",
@@ -31,12 +31,12 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleMetrics.java",
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ObjectWrapper.java",
"java/src/org/chromium/chrome/browser/customtabs/features/CustomTabNavigationBarController.java",
+ "java/src/org/chromium/chrome/browser/customtabs/features/ImmersiveModeController.java",
"java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabBrowserControlsVisibilityDelegate.java",
- "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarCoordinator.java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -66,7 +66,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler.Int
+@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler.Int
import org.chromium.chrome.browser.customtabs.content.TabCreationMode;
import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityComponent;
import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityModule;
@@ -44,17 +44,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController;
import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
-@@ -136,9 +135,6 @@ public class CustomTabActivity extends ChromeActivity= Build.VERSION_CODES.LOLLIPOP && useSeparateTask()) {
+@@ -280,10 +270,6 @@ public class CustomTabActivity extends ChromeActivityDO NOT CALL
* Public to be instanciable from {@link ChromeApplication}. This is however
-@@ -1373,7 +1370,6 @@ public class CustomTabsConnection {
+@@ -1382,7 +1379,6 @@ public class CustomTabsConnection {
if (ChromeApplication.isSevereMemorySignal(level)) {
getInstance().mClientManager.cleanupUnusedSessions();
}
@@ -151,7 +151,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
}
@VisibleForTesting
-@@ -1510,32 +1506,6 @@ public class CustomTabsConnection {
+@@ -1519,32 +1515,6 @@ public class CustomTabsConnection {
recordSpeculationStatusOnSwap(SPECULATION_STATUS_ON_SWAP_BACKGROUND_TAB_NOT_MATCHED);
}
@@ -187,16 +187,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
-@@ -15,8 +15,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigatio
- import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabController;
+@@ -18,8 +18,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabContro
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabFactory;
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
+ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleToolbarController;
+ import org.chromium.chrome.browser.customtabs.features.ImmersiveModeController;
import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
import org.chromium.chrome.browser.dependency_injection.ActivityScope;
- import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
-@@ -32,8 +30,6 @@ import dagger.Subcomponent;
+@@ -36,8 +34,6 @@ import dagger.Subcomponent;
@ActivityScope
public interface CustomTabActivityComponent extends ChromeActivityComponent {
TrustedWebActivityCoordinator resolveTrustedWebActivityCoordinator();
@@ -206,5 +206,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/depe
CustomTabBottomBarDelegate resolveBottomBarDelegate();
CustomTabActivityTabController resolveTabController();
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch
index e9143e0d..b6f708a9 100644
--- a/build/patches/Disable-fetching-of-all-field-trials.patch
+++ b/build/patches/Disable-fetching-of-all-field-trials.patch
@@ -3,42 +3,45 @@ Date: Sun, 8 Jul 2018 18:16:34 +0200
Subject: Disable fetching of all field trials
---
- .../src/org/chromium/chrome/browser/ChromeFeatureList.java | 12 +++---------
- components/variations/service/variations_service.cc | 12 +-----------
- 2 files changed, 4 insertions(+), 20 deletions(-)
+ .../chrome/browser/ChromeFeatureList.java | 15 +++------------
+ .../variations/service/variations_service.cc | 12 +-----------
+ 2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
-@@ -106,9 +106,7 @@ public abstract class ChromeFeatureList {
+@@ -107,10 +107,7 @@ public abstract class ChromeFeatureList {
*/
public static int getFieldTrialParamByFeatureAsInt(
String featureName, String paramName, int defaultValue) {
- if (sTestFeatures != null) return defaultValue;
- assert isInitialized();
-- return nativeGetFieldTrialParamByFeatureAsInt(featureName, paramName, defaultValue);
+- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt(
+- featureName, paramName, defaultValue);
+ return defaultValue;
}
/**
-@@ -125,9 +123,7 @@ public abstract class ChromeFeatureList {
+@@ -127,10 +124,7 @@ public abstract class ChromeFeatureList {
*/
public static double getFieldTrialParamByFeatureAsDouble(
String featureName, String paramName, double defaultValue) {
- if (sTestFeatures != null) return defaultValue;
- assert isInitialized();
-- return nativeGetFieldTrialParamByFeatureAsDouble(featureName, paramName, defaultValue);
+- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble(
+- featureName, paramName, defaultValue);
+ return defaultValue;
}
/**
-@@ -144,9 +140,7 @@ public abstract class ChromeFeatureList {
+@@ -147,10 +141,7 @@ public abstract class ChromeFeatureList {
*/
public static boolean getFieldTrialParamByFeatureAsBoolean(
String featureName, String paramName, boolean defaultValue) {
- if (sTestFeatures != null) return defaultValue;
- assert isInitialized();
-- return nativeGetFieldTrialParamByFeatureAsBoolean(featureName, paramName, defaultValue);
+- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean(
+- featureName, paramName, defaultValue);
+ return defaultValue;
}
@@ -46,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureLi
diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
-@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -241,17 +241,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
// Variations seed fetching is only enabled in official Chrome builds, if a URL
// is specified on the command line, and for testing.
bool IsFetchingEnabled() {
@@ -66,5 +69,5 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
std::unique_ptr MaybeImportFirstRunSeed(
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch
index ae8d21a5..64c5a2d1 100644
--- a/build/patches/Disable-media-router-and-remoting-by-default.patch
+++ b/build/patches/Disable-media-router-and-remoting-by-default.patch
@@ -3,9 +3,9 @@ Date: Thu, 4 Jul 2019 19:08:52 -0400
Subject: Disable media router and remoting by default
---
- chrome/browser/media/router/media_router_feature.cc | 17 ++++++++---------
- chrome/browser/profiles/profile.cc | 2 +-
- chrome/browser/profiles/profile_impl.cc | 2 +-
+ .../media/router/media_router_feature.cc | 17 ++++++++---------
+ chrome/browser/profiles/profile.cc | 2 +-
+ chrome/browser/profiles/profile_impl.cc | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
-@@ -223,7 +223,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -232,7 +232,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
prefs::kMediaRouterFirstRunFlowAcknowledged,
false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -52,7 +52,7 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
-@@ -444,7 +444,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -422,7 +422,7 @@ void ProfileImpl::RegisterProfilePrefs(
registry->RegisterStringPref(
prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
@@ -62,5 +62,5 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
registry->RegisterBooleanPref(
prefs::kOobeMarketingOptInScreenFinished, false,
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-metrics-collection-for-NTP-tiles.patch b/build/patches/Disable-metrics-collection-for-NTP-tiles.patch
index 24e10d1c..0188f5e2 100644
--- a/build/patches/Disable-metrics-collection-for-NTP-tiles.patch
+++ b/build/patches/Disable-metrics-collection-for-NTP-tiles.patch
@@ -3,8 +3,8 @@ Date: Wed, 20 Feb 2019 21:41:26 +0100
Subject: Disable metrics collection for NTP tiles
---
- .../android/ntp/most_visited_sites_bridge.cc | 21 ---------------------
- components/ntp_tiles/BUILD.gn | 3 ---
+ .../android/ntp/most_visited_sites_bridge.cc | 21 -------------------
+ components/ntp_tiles/BUILD.gn | 3 ---
2 files changed, 24 deletions(-)
diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
@@ -87,5 +87,5 @@ diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn
"popular_sites_impl_unittest.cc",
]
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-metrics-on-all-I-O-threads.patch b/build/patches/Disable-metrics-on-all-I-O-threads.patch
index 065d5f4c..c7ae2353 100644
--- a/build/patches/Disable-metrics-on-all-I-O-threads.patch
+++ b/build/patches/Disable-metrics-on-all-I-O-threads.patch
@@ -10,7 +10,7 @@ Subject: Disable metrics on all I/O threads
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
-@@ -909,7 +909,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -905,7 +905,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
#endif // defined(OS_CHROMEOS)
registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
@@ -32,5 +32,5 @@ diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profile
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
#include "components/signin/public/base/signin_pref_names.h"
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch b/build/patches/Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch
index dbb7093a..daed1089 100644
--- a/build/patches/Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch
+++ b/build/patches/Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch
@@ -20,5 +20,5 @@ diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/
const base::Feature kOfflinePagesCTSuppressNotificationsFeature{
"OfflinePagesCTSuppressNotifications", base::FEATURE_DISABLED_BY_DEFAULT};
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch
index 5736bb83..afd17e44 100644
--- a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch
+++ b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch
@@ -33,5 +33,5 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
const FormatUrlType kFormatUrlOmitDefaults =
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-password-reuse-detection-on-android.patch b/build/patches/Disable-password-reuse-detection-on-android.patch
new file mode 100644
index 00000000..e18e3942
--- /dev/null
+++ b/build/patches/Disable-password-reuse-detection-on-android.patch
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 15 Dec 2019 22:39:56 +0100
+Subject: Disable password reuse detection on android
+
+---
+ components/password_manager/core/browser/BUILD.gn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
+--- a/components/password_manager/core/browser/BUILD.gn
++++ b/components/password_manager/core/browser/BUILD.gn
+@@ -12,7 +12,7 @@ if (is_android) {
+
+ # TODO(crbug.com/1006430): Fix password reuse detection not fully functional on
+ # Android.
+-password_reuse_detection_support = !is_ios
++password_reuse_detection_support = !is_ios && !is_android
+ password_reuse_warning_support = !is_android && !is_ios
+ password_on_focus_ping_support = !is_android && !is_ios
+
+--
+2.17.1
+
diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch
index 52cd62c8..e23477a0 100644
--- a/build/patches/Disable-plugins-enumeration.patch
+++ b/build/patches/Disable-plugins-enumeration.patch
@@ -9,7 +9,7 @@ Subject: Disable plugins enumeration
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1234,10 +1234,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -1169,10 +1169,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
}
PluginData* LocalFrame::GetPluginData() const {
@@ -23,5 +23,5 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
void LocalFrame::SetAdTrackerForTesting(AdTracker* ad_tracker) {
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-previews-by-default.patch b/build/patches/Disable-previews-by-default.patch
index 1fc1041f..a4af8c24 100644
--- a/build/patches/Disable-previews-by-default.patch
+++ b/build/patches/Disable-previews-by-default.patch
@@ -24,5 +24,5 @@ diff --git a/components/previews/core/previews_features.cc b/components/previews
// Enables the Offline previews on android slow connections.
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch b/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch
index e00de6cd..4364f39d 100644
--- a/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch
+++ b/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch
@@ -5,11 +5,11 @@ Subject: Disable promos displayed in bookmarks manager
Remove personalized signin promo view from
bookmarks, never reach signin thresholds.
---
- .../personalized_signin_promo_view_bookmarks.xml | 30 ------------
- .../browser/bookmarks/BookmarkItemsAdapter.java | 23 +--------
- .../browser/bookmarks/BookmarkPromoHeader.java | 54 +---------------------
- .../bookmarks/ReorderBookmarkItemsAdapter.java | 19 +-------
- .../browser/signin/SigninPromoController.java | 19 +-------
+ ...rsonalized_signin_promo_view_bookmarks.xml | 30 -----------
+ .../bookmarks/BookmarkItemsAdapter.java | 23 +-------
+ .../bookmarks/BookmarkPromoHeader.java | 54 +------------------
+ .../ReorderBookmarkItemsAdapter.java | 19 +------
+ .../browser/signin/SigninPromoController.java | 19 +------
5 files changed, 7 insertions(+), 138 deletions(-)
delete mode 100644 chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
@@ -52,7 +52,7 @@ deleted file mode 100644
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
-@@ -59,7 +59,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
+@@ -60,7 +60,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
private BookmarkDelegate mDelegate;
private Context mContext;
@@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private String mSearchText;
private BookmarkId mCurrentFolder;
-@@ -217,9 +216,9 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
+@@ -219,9 +218,9 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
switch (viewType) {
case ViewType.PERSONALIZED_SIGNIN_PROMO:
@@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
case ViewType.FOLDER:
BookmarkFolderRow folder = (BookmarkFolderRow) LayoutInflater.from(
parent.getContext()).inflate(R.layout.bookmark_folder_row, parent, false);
-@@ -240,8 +239,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
+@@ -242,8 +241,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
public void onBindViewHolder(ViewHolder holder, int position) {
switch (holder.getItemViewType()) {
case ViewType.PERSONALIZED_SIGNIN_PROMO:
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
break;
case ViewType.SYNC_PROMO:
break;
-@@ -260,7 +257,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
+@@ -262,7 +259,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
public void onViewRecycled(ViewHolder holder) {
switch (holder.getItemViewType()) {
case ViewType.PERSONALIZED_SIGNIN_PROMO:
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
break;
default:
// Other view holders don't have special recycling code.
-@@ -296,7 +292,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
+@@ -298,7 +294,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
}
};
@@ -97,7 +97,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
populateTopLevelFoldersList();
notifyDataSetChanged();
}
-@@ -307,7 +302,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
+@@ -309,7 +304,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
mDelegate.removeUIObserver(this);
mDelegate.getModel().removeObserver(mBookmarkModelObserver);
mDelegate = null;
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
@Override
-@@ -387,19 +381,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
+@@ -389,19 +383,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter
if (currentUIState == BookmarkUIState.STATE_SEARCHING) return;
assert currentUIState == BookmarkUIState.STATE_FOLDER : "Unexpected UI state";
@@ -128,18 +128,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
-@@ -18,7 +18,6 @@ import org.chromium.base.ContextUtils;
+@@ -19,7 +19,6 @@ import org.chromium.base.ContextUtils;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.signin.IdentityServicesProvider;
-import org.chromium.chrome.browser.signin.PersonalizedSigninPromoView;
import org.chromium.chrome.browser.signin.ProfileDataCache;
- import org.chromium.chrome.browser.signin.SigninAccessPoint;
import org.chromium.chrome.browser.signin.SigninManager;
+ import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
@@ -132,19 +131,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+ return mPromoState;
}
- /**
+- /**
- * @return Personalized signin promo header {@link ViewHolder} instance that can be used with
- * {@link RecyclerView}.
- */
@@ -152,11 +153,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
- return new ViewHolder(view) {};
- }
-
-- /**
+ /**
* @return Sync promo header {@link ViewHolder} instance that can be used with
* {@link RecyclerView}.
- */
-@@ -156,42 +142,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+@@ -157,42 +143,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
return new ViewHolder(view) {};
}
@@ -199,7 +199,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private @PromoState int calculatePromoState() {
if (sPromoStateForTests != null) {
return sPromoStateForTests;
-@@ -204,8 +154,7 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+@@ -205,8 +155,7 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
if (!ChromeSigninController.get().isSignedIn()) {
boolean impressionLimitReached = !SigninPromoController.hasNotReachedImpressionLimit(
SigninAccessPoint.BOOKMARK_MANAGER);
@@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
return PromoState.PROMO_NONE;
}
return PromoState.PROMO_SIGNIN_PERSONALIZED;
-@@ -253,7 +202,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+@@ -254,7 +203,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
}
private void triggerPromoUpdate() {
@@ -220,7 +220,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
-@@ -186,8 +186,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter
-
--
-
@@ -93,10 +94,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
- android:key="safe_browsing"
- android:title="@string/safe_browsing_title"
- android:summary="@string/safe_browsing_summary" />
--
@@ -33,14 +20,6 @@
android:title="@string/preload_pages_title"
android:summary="@string/preload_pages_summary"
@@ -115,10 +115,11 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/res/xml/sync_and_services_preferences.xml b/chrome/android/java/res/xml/sync_and_services_preferences.xml
--- a/chrome/android/java/res/xml/sync_and_services_preferences.xml
+++ b/chrome/android/java/res/xml/sync_and_services_preferences.xml
-@@ -51,26 +51,6 @@
+@@ -50,30 +50,10 @@
+ android:title="@string/autocomplete_searches_and_urls_title"
android:summary="@string/autocomplete_searches_and_urls_summary"
android:persistent="false"/>
-
+
-
--
Uses cookies to remember your preferences, even if you don't visit those pages
@@ -360,7 +364,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
Make searches and browsing better
-@@ -421,12 +415,6 @@ CHAR-LIMIT guidelines:
+@@ -415,12 +409,6 @@ CHAR-LIMIT guidelines:
For more settings that relate to privacy, security, and data collection, see <link>Sync and Google services</link>
@@ -373,7 +377,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
Cancel sync?
-@@ -728,30 +716,12 @@ CHAR-LIMIT guidelines:
+@@ -711,30 +699,12 @@ CHAR-LIMIT guidelines:
Privacy
@@ -404,7 +408,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
Tap to Search
-@@ -4041,9 +4011,6 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -3947,9 +3917,6 @@ The site does NOT gain access to the camera. The camera images are only visible
You can see sites you visit in Chrome and set timers for them.\n\nGoogle gets info about the sites you set timers for and how long you visit them. This info is used to make Digital Wellbeing better.
@@ -417,7 +421,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
-@@ -3039,8 +3039,6 @@ jumbo_split_static_library("browser") {
+@@ -2983,8 +2983,6 @@ jumbo_static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -469,7 +473,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
-@@ -68,7 +68,6 @@
+@@ -69,7 +69,6 @@
#include "chrome/browser/printing/print_preview_dialog_controller.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
@@ -477,7 +481,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
-@@ -361,8 +360,6 @@ void BrowserProcessImpl::StartTearDown() {
+@@ -362,8 +361,6 @@ void BrowserProcessImpl::StartTearDown() {
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -486,7 +490,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
network_time_tracker_.reset();
#if BUILDFLAG(ENABLE_PLUGINS)
plugins_resource_service_.reset();
-@@ -954,22 +951,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
+@@ -950,22 +947,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
return status_tray_.get();
}
@@ -509,7 +513,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1228,23 +1209,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
+@@ -1222,23 +1203,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
}
void BrowserProcessImpl::CreateSafeBrowsingService() {
@@ -546,7 +550,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
optimization_guide::OptimizationGuideService* optimization_guide_service()
-@@ -312,9 +309,6 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -308,9 +305,6 @@ class BrowserProcessImpl : public BrowserProcess,
std::unique_ptr background_mode_manager_;
#endif
@@ -617,7 +621,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
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
-@@ -120,10 +120,9 @@
+@@ -111,10 +111,9 @@
#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
#include "chrome/browser/renderer_preferences_util.h"
#include "chrome/browser/resource_coordinator/background_tab_navigation_throttle.h"
@@ -630,22 +634,18 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#include "chrome/browser/safe_browsing/ui_manager.h"
#include "chrome/browser/safe_browsing/url_checker_delegate_impl.h"
#include "chrome/browser/search/search.h"
-@@ -136,11 +135,13 @@
- #include "chrome/browser/speech/tts_controller_delegate_impl.h"
- #include "chrome/browser/ssl/insecure_sensitive_input_driver_factory.h"
- #include "chrome/browser/ssl/ssl_blocking_page.h"
--#include "chrome/browser/ssl/ssl_cert_reporter.h"
-+//#include "chrome/browser/ssl/ssl_cert_reporter.h"
- #include "chrome/browser/ssl/ssl_client_auth_metrics.h"
- #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
- #include "chrome/browser/ssl/ssl_error_handler.h"
+@@ -237,8 +236,10 @@
+ #include "components/safe_browsing/features.h"
+ #include "components/safe_browsing/password_protection/password_protection_navigation_throttle.h"
+ #include "components/security_interstitials/content/origin_policy_ui.h"
+#if defined(FULL_SAFE_BROWSING)
- #include "chrome/browser/ssl/ssl_error_navigation_throttle.h"
+ #include "components/security_interstitials/content/ssl_cert_reporter.h"
+ #include "components/security_interstitials/content/ssl_error_navigation_throttle.h"
+#endif
- #include "chrome/browser/ssl/typed_navigation_timing_throttle.h"
- #include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"
- #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
-@@ -862,30 +863,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h"
+ #include "components/translate/core/common/translate_switches.h"
+@@ -837,30 +838,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
GetIOThreadApplicationLocale() = locale;
}
@@ -676,7 +676,23 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if defined(OS_ANDROID)
float GetDeviceScaleAdjustment() {
static const float kMinFSM = 1.05f;
-@@ -1264,7 +1241,9 @@ void ChromeContentBrowserClient::PostAfterStartupTask(
+@@ -1044,6 +1021,7 @@ void MaybeAddThrottle(
+ throttles->push_back(std::move(maybe_throttle));
+ }
+
++#if defined(FULL_SAFE_BROWSING)
+ // Returns whether |web_contents| is within a hosted app.
+ bool IsInHostedApp(WebContents* web_contents) {
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+@@ -1054,6 +1032,7 @@ bool IsInHostedApp(WebContents* web_contents) {
+ return false;
+ #endif
+ }
++#endif
+
+ } // namespace
+
+@@ -1259,7 +1238,9 @@ void ChromeContentBrowserClient::PostAfterStartupTask(
InitNetworkContextsParentDirectory();
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -686,16 +702,16 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
}
bool ChromeContentBrowserClient::IsBrowserStartupComplete() {
-@@ -2031,7 +2010,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -1957,7 +1938,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
}
#elif defined(OS_POSIX)
#if defined(OS_ANDROID)
- bool enable_crash_reporter = true;
+ bool enable_crash_reporter = false;
#else
- bool enable_crash_reporter = breakpad::IsCrashReporterEnabled();
- #endif
-@@ -2122,7 +2101,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+ bool enable_crash_reporter = false;
+ if (crash_reporter::IsCrashpadEnabled()) {
+@@ -2062,7 +2043,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
// Disable client-side phishing detection in the renderer if it is
// disabled in the Profile preferences or the browser process.
if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
@@ -704,25 +720,24 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
command_line->AppendSwitch(
switches::kDisableClientSidePhishingDetection);
}
-@@ -4202,12 +4181,12 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
-
+@@ -3946,11 +3927,13 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
throttles.push_back(std::make_unique(
handle, handle->GetWebContents()->GetBrowserContext()));
--
+
+#if defined(FULL_SAFE_BROWSING)
throttles.push_back(std::make_unique(
handle,
std::make_unique(web_contents),
- base::Bind(&SSLErrorHandler::HandleSSLError)));
--
+ base::Bind(&SSLErrorHandler::HandleSSLError),
+ base::Bind(&IsInHostedApp)));
+#endif
+
throttles.push_back(std::make_unique(handle));
- std::unique_ptr https_upgrade_timing_throttle =
-@@ -4238,11 +4217,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
- PreviewsLitePageDecider::MaybeCreateThrottleFor(handle);
- if (previews_lite_page_throttle)
- throttles.push_back(std::move(previews_lite_page_throttle));
+@@ -3970,11 +3953,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+ GooglePasswordManagerNavigationThrottle::MaybeCreateThrottleFor(handle));
+ #endif
+
- if (base::FeatureList::IsEnabled(safe_browsing::kCommittedSBInterstitials)) {
- throttles.push_back(
- std::make_unique(
@@ -731,7 +746,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if defined(OS_WIN) || defined(OS_MACOSX) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
-@@ -5250,19 +5224,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
+@@ -4931,19 +4909,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
content::ResourceContext* resource_context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -789,7 +804,7 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -40,9 +40,11 @@
+@@ -39,9 +39,11 @@
#include "chrome/browser/download/save_package_file_picker.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/profiles/profile.h"
@@ -801,7 +816,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
#include "chrome/common/buildflags.h"
-@@ -51,7 +53,9 @@
+@@ -50,7 +52,9 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pdf_util.h"
#include "chrome/common/pref_names.h"
@@ -811,7 +826,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#include "chrome/grit/generated_resources.h"
#include "components/download/public/common/download_danger_type.h"
#include "components/download/public/common/download_features.h"
-@@ -122,8 +126,10 @@ using content::DownloadManager;
+@@ -115,8 +119,10 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -822,7 +837,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
namespace {
-@@ -345,13 +351,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
+@@ -322,13 +328,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm;
@@ -836,7 +851,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
}
#if defined(OS_ANDROID)
-@@ -654,16 +653,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
+@@ -638,16 +637,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename) {
@@ -853,7 +868,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
}
void ChromeDownloadManagerDelegate::OpenDownloadUsingPlatformHandler(
-@@ -797,19 +786,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
+@@ -771,19 +760,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
return std::string(chrome::kApplicationClientIDStringForAVScanning);
}
@@ -875,7 +890,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
void ChromeDownloadManagerDelegate::ShouldBlockDownload(
download::DownloadItem* download,
-@@ -1262,13 +1251,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
+@@ -1239,13 +1228,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
@@ -891,13 +906,13 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
}
+#endif
- if (base::FeatureList::IsEnabled(
- download::features::kPreventDownloadsWithSamePath)) {
+ base::FilePath target_path = target_info->target_path;
+ // A separate reservation with the same target path may exist.
diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
--- a/chrome/browser/download/chrome_download_manager_delegate.h
+++ b/chrome/browser/download/chrome_download_manager_delegate.h
-@@ -21,8 +21,10 @@
- #include "build/build_config.h"
+@@ -22,8 +22,10 @@
+ #include "chrome/browser/download/download_completion_blocker.h"
#include "chrome/browser/download/download_target_determiner_delegate.h"
#include "chrome/browser/download/download_target_info.h"
+#if defined(FULL_SAFE_BROWSING)
@@ -907,9 +922,18 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
#include "components/download/public/common/download_danger_type.h"
#include "components/download/public/common/download_item.h"
#include "components/download/public/common/download_path_reservation_tracker.h"
-@@ -135,8 +137,10 @@ class ChromeDownloadManagerDelegate
+@@ -134,7 +136,7 @@ class ChromeDownloadManagerDelegate
+
DownloadPrefs* download_prefs() { return download_prefs_.get(); }
+-#if BUILDFLAG(FULL_SAFE_BROWSING)
++#if defined(FULL_SAFE_BROWSING)
+ // The state of a safebrowsing check.
+ class SafeBrowsingState : public DownloadCompletionBlocker {
+ public:
+@@ -151,8 +153,10 @@ class ChromeDownloadManagerDelegate
+ #endif // FULL_SAFE_BROWSING
+
protected:
+#if defined(FULL_SAFE_BROWSING)
virtual safe_browsing::DownloadProtectionService*
@@ -918,7 +942,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
// Show file picker for |download|.
virtual void ShowFilePickerForDownload(
-@@ -205,9 +209,11 @@ class ChromeDownloadManagerDelegate
+@@ -221,9 +225,11 @@ class ChromeDownloadManagerDelegate
const content::NotificationSource& source,
const content::NotificationDetails& details) override;
@@ -977,7 +1001,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
is_being_revived_(false) {}
} // namespace
-@@ -378,6 +386,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
+@@ -388,6 +396,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
data->should_prefer_opening_in_browser_ = preference;
}
@@ -985,7 +1009,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS;
-@@ -388,6 +397,7 @@ void DownloadItemModel::SetDangerLevel(
+@@ -398,6 +407,7 @@ void DownloadItemModel::SetDangerLevel(
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -993,7 +1017,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
bool DownloadItemModel::IsBeingRevived() const {
const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
-@@ -536,9 +546,6 @@ bool DownloadItemModel::IsCommandEnabled(
+@@ -546,9 +556,6 @@ bool DownloadItemModel::IsCommandEnabled(
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -1014,9 +1038,9 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/down
#include "chrome/common/safe_browsing/download_file_types.pb.h"
+#endif
#include "components/download/public/common/download_item.h"
+ #include "components/safe_browsing/buildflags.h"
- // Implementation of DownloadUIModel that wrappers around a |DownloadItem*|. As
-@@ -48,9 +50,11 @@ class DownloadItemModel : public DownloadUIModel,
+@@ -49,9 +51,11 @@ class DownloadItemModel : public DownloadUIModel,
void SetWasUINotified(bool should_notify) override;
bool ShouldPreferOpeningInBrowser() const override;
void SetShouldPreferOpeningInBrowser(bool preference) override;
@@ -1031,7 +1055,7 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/down
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
-@@ -33,7 +33,9 @@
+@@ -34,7 +34,9 @@
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pref_names.h"
@@ -1041,7 +1065,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download
#include "components/download/public/common/download_item.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
-@@ -55,7 +57,9 @@
+@@ -56,7 +58,9 @@
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
@@ -1051,7 +1075,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download
namespace {
-@@ -224,14 +228,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) {
+@@ -228,14 +232,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) {
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
extension);
@@ -1067,7 +1091,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download
}
}
-@@ -381,10 +378,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
+@@ -385,10 +382,6 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
bool DownloadPrefs::EnableAutoOpenBasedOnExtension(
const base::FilePath& file_name) {
base::FilePath::StringType extension = file_name.Extension();
@@ -1331,7 +1355,7 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl
using offline_items_collection::FailState;
namespace {
-@@ -390,12 +392,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() const {
+@@ -401,12 +403,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() const {
void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {}
@@ -1358,8 +1382,8 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo
+#endif
#include "components/download/public/common/download_item.h"
#include "components/offline_items_collection/core/offline_item.h"
-
-@@ -172,6 +174,7 @@ class DownloadUIModel {
+ #include "components/safe_browsing/buildflags.h"
+@@ -173,6 +175,7 @@ class DownloadUIModel {
// Change what's returned by ShouldPreferOpeningInBrowser to |preference|.
virtual void SetShouldPreferOpeningInBrowser(bool preference);
@@ -1367,7 +1391,7 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo
// Return the danger level determined during download target determination.
// The value returned here is independent of the danger level as determined by
// the Safe Browsing.
-@@ -180,6 +183,7 @@ class DownloadUIModel {
+@@ -181,6 +184,7 @@ class DownloadUIModel {
// Change what's returned by GetDangerLevel().
virtual void SetDangerLevel(
safe_browsing::DownloadFileType::DangerLevel danger_level);
@@ -1386,7 +1410,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
-@@ -1311,9 +1310,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {}
+@@ -1325,9 +1324,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {}
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@@ -1396,7 +1420,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
bool DownloadsAcceptDangerFunction::RunAsync() {
std::unique_ptr params(
downloads::AcceptDanger::Params::Create(*args_));
-@@ -1351,40 +1347,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) {
+@@ -1365,40 +1361,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) {
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -1449,7 +1473,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "chrome/common/extensions/api/downloads.h"
#include "components/download/content/public/all_download_item_notifier.h"
-@@ -189,25 +188,16 @@ class DownloadsRemoveFileFunction : public ChromeAsyncExtensionFunction {
+@@ -186,25 +185,16 @@ class DownloadsRemoveFileFunction : public ChromeAsyncExtensionFunction {
class DownloadsAcceptDangerFunction : public ChromeAsyncExtensionFunction {
public:
@@ -1478,7 +1502,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -682,51 +682,9 @@ WebstorePrivateGetReferrerChainFunction::
+@@ -683,51 +683,9 @@ WebstorePrivateGetReferrerChainFunction::
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -1612,7 +1636,7 @@ diff --git a/chrome/browser/extensions/blacklist_state_fetcher.h b/chrome/browse
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -773,9 +773,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
+@@ -759,9 +759,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
metrics_service_->RegisterMetricsProvider(
std::make_unique());
@@ -1633,130 +1657,59 @@ diff --git a/chrome/browser/native_file_system/chrome_native_file_system_permiss
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/common/chrome_paths.h"
-@@ -322,74 +321,6 @@ class ReadPermissionGrantImpl
+@@ -328,6 +327,7 @@ class ReadPermissionGrantImpl
PermissionStatus status_ = PermissionStatus::GRANTED;
};
--void DoSafeBrowsingCheckOnUIThread(
-- int process_id,
-- int frame_id,
-- std::unique_ptr item,
-- safe_browsing::CheckDownloadCallback callback) {
-- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
--
-- safe_browsing::SafeBrowsingService* sb_service =
-- g_browser_process->safe_browsing_service();
--
-- if (!sb_service || !sb_service->download_protection_service() ||
-- !sb_service->download_protection_service()->enabled()) {
-- std::move(callback).Run(safe_browsing::DownloadCheckResult::UNKNOWN);
-- return;
-- }
--
-- if (!item->browser_context) {
-- content::RenderProcessHost* rph =
-- content::RenderProcessHost::FromID(process_id);
-- if (!rph) {
-- std::move(callback).Run(safe_browsing::DownloadCheckResult::UNKNOWN);
-- return;
-- }
-- item->browser_context = rph->GetBrowserContext();
-- }
--
-- if (!item->web_contents) {
-- content::RenderFrameHost* rfh =
-- content::RenderFrameHost::FromID(process_id, frame_id);
-- if (rfh)
-- item->web_contents = content::WebContents::FromRenderFrameHost(rfh);
-- }
--
-- sb_service->download_protection_service()->CheckNativeFileSystemWrite(
-- std::move(item), std::move(callback));
--}
--
--ChromeNativeFileSystemPermissionContext::SafeBrowsingResult
--InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) {
-- using Result = safe_browsing::DownloadCheckResult;
-- switch (result) {
-- // Only allow downloads that are marked as SAFE or UNKNOWN by SafeBrowsing.
-- // All other types are going to be blocked. UNKNOWN could be the result of a
-- // failed safe browsing ping.
-- case Result::UNKNOWN:
-- case Result::SAFE:
-- case Result::WHITELISTED_BY_POLICY:
-- return ChromeNativeFileSystemPermissionContext::SafeBrowsingResult::
-- kAllow;
--
-- case Result::DANGEROUS:
-- case Result::UNCOMMON:
-- case Result::DANGEROUS_HOST:
-- case Result::POTENTIALLY_UNWANTED:
-- case Result::BLOCKED_PASSWORD_PROTECTED:
-- return ChromeNativeFileSystemPermissionContext::SafeBrowsingResult::
-- kBlock;
--
-- // This shouldn't be returned for Native File System write checks.
-- case Result::ASYNC_SCANNING:
-- NOTREACHED();
-- return ChromeNativeFileSystemPermissionContext::SafeBrowsingResult::
-- kAllow;
-- }
-- NOTREACHED();
-- return ChromeNativeFileSystemPermissionContext::SafeBrowsingResult::kBlock;
--}
--
++#if defined(FULL_SAFE_BROWSING)
+ void DoSafeBrowsingCheckOnUIThread(
+ int process_id,
+ int frame_id,
+@@ -396,6 +396,7 @@ InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) {
+ NOTREACHED();
+ return ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult::kBlock;
+ }
++#endif
+
} // namespace
- ChromeNativeFileSystemPermissionContext::Grants::Grants() = default;
-@@ -666,28 +597,6 @@ void ChromeNativeFileSystemPermissionContext::ConfirmSensitiveDirectoryAccess(
- std::move(callback)));
+@@ -677,6 +678,7 @@ void ChromeNativeFileSystemPermissionContext::ConfirmSensitiveDirectoryAccess(
+ process_id, frame_id, std::move(callback)));
}
--void ChromeNativeFileSystemPermissionContext::PerformSafeBrowsingChecks(
-- std::unique_ptr item,
-- int process_id,
-- int frame_id,
-- base::OnceCallback callback) {
-- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-- base::PostTask(
-- FROM_HERE, {content::BrowserThread::UI},
-- base::BindOnce(
-- &DoSafeBrowsingCheckOnUIThread, process_id, frame_id, std::move(item),
-- base::BindOnce(
-- [](scoped_refptr task_runner,
-- base::OnceCallback callback,
-- safe_browsing::DownloadCheckResult result) {
-- task_runner->PostTask(
-- FROM_HERE,
-- base::BindOnce(std::move(callback),
-- InterpretSafeBrowsingResult(result)));
-- },
-- base::SequencedTaskRunnerHandle::Get(), std::move(callback))));
--}
--
++#if defined(FULL_SAFE_BROWSING)
+ void ChromeNativeFileSystemPermissionContext::PerformAfterWriteChecks(
+ std::unique_ptr item,
+ int process_id,
+@@ -699,6 +701,7 @@ void ChromeNativeFileSystemPermissionContext::PerformAfterWriteChecks(
+ },
+ base::SequencedTaskRunnerHandle::Get(), std::move(callback))));
+ }
++#endif
+
ChromeNativeFileSystemPermissionContext::Grants
ChromeNativeFileSystemPermissionContext::GetPermissionGrants(
- const url::Origin& origin,
diff --git a/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h b/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h
--- a/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h
+++ b/chrome/browser/native_file_system/chrome_native_file_system_permission_context.h
-@@ -155,12 +155,6 @@ class ChromeNativeFileSystemPermissionContext
+@@ -152,11 +152,13 @@ class ChromeNativeFileSystemPermissionContext
int frame_id,
base::OnceCallback callback) override;
-- void PerformSafeBrowsingChecks(
-- std::unique_ptr item,
-- int process_id,
-- int frame_id,
-- base::OnceCallback callback) override;
--
- struct Grants {
- Grants();
- ~Grants();
++#if defined(FULL_SAFE_BROWSING)
+ void PerformAfterWriteChecks(
+ std::unique_ptr item,
+ int process_id,
+ int frame_id,
+ base::OnceCallback callback) override;
++#endif
+
+ // Returns a snapshot of the currently granted permissions.
+ // TODO(https://crbug.com/984769): Eliminate process_id and frame_id from this
diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
-@@ -125,9 +125,6 @@ void TrialComparisonCertVerifierController::SendTrialReport(
+@@ -127,9 +127,6 @@ void TrialComparisonCertVerifierController::SendTrialReport(
std::string serialized_report;
if (!report.Serialize(&serialized_report))
return;
@@ -1769,7 +1722,7 @@ diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/c
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -244,7 +244,6 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -252,7 +252,6 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalServiceFactory::GetInstance();
#endif
@@ -1780,7 +1733,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
-@@ -90,7 +90,6 @@
+@@ -91,7 +91,6 @@
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
@@ -1788,23 +1741,23 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/signin/signin_ui_util.h"
-@@ -623,16 +622,6 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
- pref_registry_.get());
-
- prefs::mojom::TrackedPreferenceValidationDelegatePtr pref_validation_delegate;
-- scoped_refptr safe_browsing_service(
-- g_browser_process->safe_browsing_service());
-- if (safe_browsing_service.get()) {
-- auto pref_validation_delegate_impl =
-- safe_browsing_service->CreatePreferenceValidationDelegate(this);
-- if (pref_validation_delegate_impl) {
-- mojo::MakeStrongBinding(std::move(pref_validation_delegate_impl),
-- mojo::MakeRequest(&pref_validation_delegate));
-- }
-- }
+@@ -602,6 +601,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
+ mojo::PendingRemote
+ pref_validation_delegate;
++#if defined(FULL_SAFE_BROWSING)
+ scoped_refptr safe_browsing_service(
+ g_browser_process->safe_browsing_service());
+ if (safe_browsing_service.get()) {
+@@ -613,7 +613,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) {
+ pref_validation_delegate.InitWithNewPipeAndPassReceiver());
+ }
+ }
+-
++#endif
prefs_ =
CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
+ profile_policy_connector_->policy_service(),
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -1859,7 +1812,7 @@ diff --git a/chrome/browser/ssl/captive_portal_blocking_page.cc b/chrome/browser
diff --git a/chrome/browser/ssl/cert_report_helper.cc b/chrome/browser/ssl/cert_report_helper.cc
--- a/chrome/browser/ssl/cert_report_helper.cc
+++ b/chrome/browser/ssl/cert_report_helper.cc
-@@ -180,8 +180,6 @@ void CertReportHelper::FinishCertCollection() {
+@@ -181,8 +181,6 @@ void CertReportHelper::FinishCertCollection() {
LOG(ERROR) << "Failed to serialize certificate report.";
return;
}
@@ -1871,92 +1824,19 @@ diff --git a/chrome/browser/ssl/cert_report_helper.cc b/chrome/browser/ssl/cert_
diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -160,88 +160,6 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const {
+@@ -234,6 +234,7 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const {
security_state::MaliciousContentStatus
SecurityStateTabHelper::GetMaliciousContentStatus() const {
-- content::NavigationEntry* entry =
-- web_contents()->GetController().GetVisibleEntry();
-- if (!entry)
-- return security_state::MALICIOUS_CONTENT_STATUS_NONE;
-- safe_browsing::SafeBrowsingService* sb_service =
-- g_browser_process->safe_browsing_service();
-- if (!sb_service)
-- return security_state::MALICIOUS_CONTENT_STATUS_NONE;
-- scoped_refptr sb_ui_manager = sb_service->ui_manager();
-- safe_browsing::SBThreatType threat_type;
-- if (sb_ui_manager->IsUrlWhitelistedOrPendingForWebContents(
-- entry->GetURL(), false, entry, web_contents(), false, &threat_type)) {
-- switch (threat_type) {
-- case safe_browsing::SB_THREAT_TYPE_UNUSED:
-- case safe_browsing::SB_THREAT_TYPE_SAFE:
-- case safe_browsing::SB_THREAT_TYPE_URL_PHISHING:
-- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING:
-- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
-- case safe_browsing::SB_THREAT_TYPE_URL_MALWARE:
-- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE:
-- return security_state::MALICIOUS_CONTENT_STATUS_MALWARE;
-- case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED:
-- return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE;
-- case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_SYNC_PASSWORD_REUSE:
--#if BUILDFLAG(FULL_SAFE_BROWSING)
-- if (safe_browsing::ChromePasswordProtectionService::
-- ShouldShowPasswordReusePageInfoBubble(
-- web_contents(), PasswordType::PRIMARY_ACCOUNT_PASSWORD)) {
-- return security_state::
-- MALICIOUS_CONTENT_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE;
-- }
-- // If user has already changed Gaia password, returns the regular
-- // social engineering content status.
-- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
--#endif
-- case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE:
--#if BUILDFLAG(FULL_SAFE_BROWSING)
-- if (safe_browsing::ChromePasswordProtectionService::
-- ShouldShowPasswordReusePageInfoBubble(
-- web_contents(), PasswordType::OTHER_GAIA_PASSWORD)) {
-- return security_state::
-- MALICIOUS_CONTENT_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE;
-- }
-- // If user has already changed Gaia password, returns the regular
-- // social engineering content status.
-- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
--#endif
-- case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE:
--#if BUILDFLAG(FULL_SAFE_BROWSING)
-- if (safe_browsing::ChromePasswordProtectionService::
-- ShouldShowPasswordReusePageInfoBubble(
-- web_contents(), PasswordType::ENTERPRISE_PASSWORD)) {
-- return security_state::
-- MALICIOUS_CONTENT_STATUS_ENTERPRISE_PASSWORD_REUSE;
-- }
-- // If user has already changed Gaia password, returns the regular
-- // social engineering content status.
-- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
--#endif
-- case safe_browsing::SB_THREAT_TYPE_BILLING:
-- return security_state::MALICIOUS_CONTENT_STATUS_BILLING;
-- case safe_browsing::
-- DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
-- case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE:
-- case safe_browsing::SB_THREAT_TYPE_EXTENSION:
-- case safe_browsing::SB_THREAT_TYPE_BLACKLISTED_RESOURCE:
-- case safe_browsing::SB_THREAT_TYPE_API_ABUSE:
-- case safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER:
-- case safe_browsing::SB_THREAT_TYPE_CSD_WHITELIST:
-- case safe_browsing::SB_THREAT_TYPE_AD_SAMPLE:
-- case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_POPUP:
-- case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_REDIRECT:
-- case safe_browsing::SB_THREAT_TYPE_SUSPICIOUS_SITE:
-- case safe_browsing::SB_THREAT_TYPE_APK_DOWNLOAD:
-- case safe_browsing::SB_THREAT_TYPE_HIGH_CONFIDENCE_ALLOWLIST:
-- // These threat types are not currently associated with
-- // interstitials, and thus resources with these threat types are
-- // not ever whitelisted or pending whitelisting.
-- NOTREACHED();
-- break;
-- }
-- }
++#if defined(FULL_SAFE_BROWSING)
+ content::NavigationEntry* entry =
+ web_contents()->GetController().GetVisibleEntry();
+ if (!entry)
+@@ -320,6 +321,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
+ break;
+ }
+ }
++#endif
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
@@ -1983,7 +1863,7 @@ diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
-@@ -2662,7 +2662,6 @@ jumbo_split_static_library("ui") {
+@@ -2706,7 +2706,6 @@ jumbo_static_library("ui") {
"views/device_chooser_content_view.h",
"views/devtools_process_observer.cc",
"views/devtools_process_observer.h",
@@ -1994,27 +1874,24 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
-@@ -50,8 +50,8 @@
- #include "chrome/browser/previews/resource_loading_hints/resource_loading_hints_web_contents_observer.h"
+@@ -49,8 +49,6 @@
#include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/profiles/profile_key.h"
#include "chrome/browser/resource_coordinator/tab_helper.h"
-#include "chrome/browser/safe_browsing/safe_browsing_navigation_observer.h"
-#include "chrome/browser/safe_browsing/trigger_creator.h"
-+//#include "chrome/browser/safe_browsing/safe_browsing_navigation_observer.h"
-+//#include "chrome/browser/safe_browsing/trigger_creator.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ssl/connection_help_tab_helper.h"
#include "chrome/browser/ssl/security_state_tab_helper.h"
-@@ -108,7 +108,7 @@
+@@ -109,7 +107,6 @@
#else
#include "chrome/browser/banners/app_banner_manager_desktop.h"
#include "chrome/browser/plugins/plugin_observer.h"
-#include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
-+//#include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
#include "chrome/browser/ui/hung_plugin_tab_helper.h"
#include "chrome/browser/ui/intent_picker_tab_helper.h"
-@@ -247,10 +247,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -248,10 +245,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
PreviewsUITabHelper::CreateForWebContents(web_contents);
RecentlyAudibleHelper::CreateForWebContents(web_contents);
ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
@@ -2025,7 +1902,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
safety_tips::ReputationWebContentsObserver::CreateForWebContents(
web_contents);
SearchEngineTabHelper::CreateForWebContents(web_contents);
-@@ -303,7 +299,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -304,7 +297,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
web_contents, std::make_unique());
PluginObserver::CreateForWebContents(web_contents);
SadTabHelper::CreateForWebContents(web_contents);
@@ -2036,7 +1913,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -271,6 +271,7 @@ LookalikeUrlInterstitialPage* CreateLookalikeInterstitialPage(
+@@ -277,6 +277,7 @@ LookalikeUrlInterstitialPage* CreateLookalikeInterstitialPage(
safe_url));
}
@@ -2044,7 +1921,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
content::WebContents* web_contents) {
safe_browsing::SBThreatType threat_type =
-@@ -329,7 +330,9 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
+@@ -335,7 +336,9 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
g_browser_process->safe_browsing_service()->ui_manager().get(),
web_contents, main_frame_url, resource);
}
@@ -2054,7 +1931,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage(
content::WebContents* web_contents) {
safe_browsing::SBThreatType threat_type =
-@@ -381,6 +384,7 @@ TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage(
+@@ -387,6 +390,7 @@ TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage(
g_browser_process->safe_browsing_service()->ui_manager().get(),
web_contents, main_frame_url, resource, is_giant_webview);
}
@@ -2062,7 +1939,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
-@@ -487,8 +491,6 @@ void InterstitialHTMLSource::StartDataRequest(
+@@ -493,8 +497,6 @@ void InterstitialHTMLSource::StartDataRequest(
interstitial_delegate.reset(CreateSSLBlockingPage(web_contents));
} else if (path_without_query == "/mitm-software-ssl") {
interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents));
@@ -2071,7 +1948,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
} else if (path_without_query == "/clock") {
interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents));
} else if (path_without_query == "/lookalike") {
-@@ -500,13 +502,6 @@ void InterstitialHTMLSource::StartDataRequest(
+@@ -506,13 +508,6 @@ void InterstitialHTMLSource::StartDataRequest(
} else if (path_without_query == "/origin_policy") {
interstitial_delegate.reset(
CreateOriginPolicyInterstitialPage(web_contents));
@@ -2106,10 +1983,10 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/
- ]
-}
-
- if (safe_browsing_mode == 1) {
- source_set("archive_analyzer_results") {
+ if (is_win) {
+ source_set("pe_image_reader") {
sources = [
-@@ -150,7 +136,6 @@ if (safe_browsing_mode == 1) {
+@@ -167,7 +153,6 @@ if (safe_browsing_mode == 1) {
source_set("safe_browsing") {
deps = [
@@ -2120,7 +1997,7 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -85,7 +85,6 @@
+@@ -86,7 +86,6 @@
#include "components/page_load_metrics/renderer/metrics_render_frame_observer.h"
#include "components/pdf/renderer/pepper_pdf_host.h"
#include "components/safe_browsing/buildflags.h"
@@ -2131,10 +2008,10 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
--- a/components/password_manager/core/browser/BUILD.gn
+++ b/components/password_manager/core/browser/BUILD.gn
-@@ -12,7 +12,7 @@ if (is_android) {
-
- # TODO(crbug.com/706392): Fix password reuse detection for Android.
- password_reuse_detection_support = !is_android && !is_ios
+@@ -14,7 +14,7 @@ if (is_android) {
+ # Android.
+ password_reuse_detection_support = !is_ios
+ password_reuse_warning_support = !is_android && !is_ios
-password_on_focus_ping_support = !is_ios
+password_on_focus_ping_support = !is_android && !is_ios
@@ -2143,8 +2020,8 @@ diff --git a/components/password_manager/core/browser/BUILD.gn b/components/pass
diff --git a/components/safe_browsing/features.cc b/components/safe_browsing/features.cc
--- a/components/safe_browsing/features.cc
+++ b/components/safe_browsing/features.cc
-@@ -63,7 +63,7 @@ const base::Feature kSendOnFocusPing {
- #endif
+@@ -87,7 +87,7 @@ constexpr base::FeatureParam kShouldFillOldPhishGuardProto{
+ &kPasswordProtectionForSignedInUsers, "DeprecateOldProto", false};
const base::Feature kSuspiciousSiteTriggerQuotaFeature{
- "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -2167,7 +2044,7 @@ diff --git a/components/unified_consent/unified_consent_service.cc b/components/
diff --git a/content/browser/native_file_system/native_file_system_file_writer_impl.cc b/content/browser/native_file_system/native_file_system_file_writer_impl.cc
--- a/content/browser/native_file_system/native_file_system_file_writer_impl.cc
+++ b/content/browser/native_file_system/native_file_system_file_writer_impl.cc
-@@ -91,8 +91,7 @@ NativeFileSystemFileWriterImpl::NativeFileSystemFileWriterImpl(
+@@ -93,8 +93,7 @@ NativeFileSystemFileWriterImpl::NativeFileSystemFileWriterImpl(
url,
handle_state,
/*is_directory=*/false),
@@ -2177,22 +2054,22 @@ diff --git a/content/browser/native_file_system/native_file_system_file_writer_i
DCHECK_EQ(swap_url.type(), url.type());
}
-@@ -296,48 +295,7 @@ void NativeFileSystemFileWriterImpl::CloseImpl(CloseCallback callback) {
+@@ -302,50 +301,7 @@ void NativeFileSystemFileWriterImpl::CloseImpl(CloseCallback callback) {
// swap file even if the writer was destroyed at that point.
state_ = State::kClosePending;
-- if (!require_safe_browsing_check() || !manager()->permission_context()) {
-- DidPassSafeBrowsingCheck(std::move(callback));
+- if (!RequireAfterWriteCheck() || !manager()->permission_context()) {
+- DidPassAfterWriteCheck(std::move(callback));
- return;
- }
-
- ComputeHashForSwapFile(base::BindOnce(
-- &NativeFileSystemFileWriterImpl::DoSafeBrowsingCheck,
+- &NativeFileSystemFileWriterImpl::DoAfterWriteCheck,
- weak_factory_.GetWeakPtr(), swap_url().path(), std::move(callback)));
-}
-
-// static
--void NativeFileSystemFileWriterImpl::DoSafeBrowsingCheck(
+-void NativeFileSystemFileWriterImpl::DoAfterWriteCheck(
- base::WeakPtr file_writer,
- const base::FilePath& swap_path,
- NativeFileSystemFileWriterImpl::CloseCallback callback,
@@ -2211,6 +2088,8 @@ diff --git a/content/browser/native_file_system/native_file_system_file_writer_i
- return;
- }
-
+- DCHECK_CALLED_ON_VALID_SEQUENCE(file_writer->sequence_checker_);
+-
- auto item = std::make_unique();
- item->target_file_path = file_writer->url().path();
- item->full_path = file_writer->swap_url().path();
@@ -2218,49 +2097,49 @@ diff --git a/content/browser/native_file_system/native_file_system_file_writer_i
- item->size = size;
- item->frame_url = file_writer->context().url;
- item->has_user_gesture = file_writer->has_transient_user_activation_;
-- file_writer->manager()->permission_context()->PerformSafeBrowsingChecks(
+- file_writer->manager()->permission_context()->PerformAfterWriteChecks(
- std::move(item), file_writer->context().process_id,
- file_writer->context().frame_id,
-- base::BindOnce(&NativeFileSystemFileWriterImpl::DidSafeBrowsingCheck,
+- base::BindOnce(&NativeFileSystemFileWriterImpl::DidAfterWriteCheck,
- file_writer, swap_path, std::move(callback)));
-+ DidPassSafeBrowsingCheck(std::move(callback));
++ DidPassAfterWriteCheck(std::move(callback));
}
// static
diff --git a/content/browser/native_file_system/native_file_system_file_writer_impl.h b/content/browser/native_file_system/native_file_system_file_writer_impl.h
--- a/content/browser/native_file_system/native_file_system_file_writer_impl.h
+++ b/content/browser/native_file_system/native_file_system_file_writer_impl.h
-@@ -88,15 +88,8 @@ class CONTENT_EXPORT NativeFileSystemFileWriterImpl
+@@ -80,15 +80,8 @@ class CONTENT_EXPORT NativeFileSystemFileWriterImpl
bool complete);
void TruncateImpl(uint64_t length, TruncateCallback callback);
void CloseImpl(CloseCallback callback);
- // The following two methods are static, because they need to be invoked to
-+ // The following method is static because it needs to be invoked to
++ // The following method is static, because it needs to be invoked to
// perform cleanup even if the writer was deleted before they were invoked.
-- static void DoSafeBrowsingCheck(
+- static void DoAfterWriteCheck(
- base::WeakPtr file_writer,
- const base::FilePath& swap_path,
- NativeFileSystemFileWriterImpl::CloseCallback callback,
- base::File::Error hash_result,
- const std::string& hash,
- int64_t size);
- static void DidSafeBrowsingCheck(
+ static void DidAfterWriteCheck(
base::WeakPtr file_writer,
const base::FilePath& swap_path,
-@@ -109,7 +102,7 @@ class CONTENT_EXPORT NativeFileSystemFileWriterImpl
+@@ -101,7 +94,7 @@ class CONTENT_EXPORT NativeFileSystemFileWriterImpl
- // Safe browsing checks only apply to native local paths.
- bool require_safe_browsing_check() {
+ // After write checks only apply to native local paths.
+ bool RequireAfterWriteCheck() const {
- return url().type() == storage::kFileSystemTypeNativeLocal;
+ return false;
}
// Quarantine checks only apply to native local paths.
-@@ -149,10 +142,6 @@ class CONTENT_EXPORT NativeFileSystemFileWriterImpl
+@@ -141,10 +134,6 @@ class CONTENT_EXPORT NativeFileSystemFileWriterImpl
bool skip_quarantine_check_for_testing_ = false;
-- // Keeps track of user activation state at creation time for SafeBrowsing
+- // Keeps track of user activation state at creation time for after write
- // checks.
- bool has_transient_user_activation_ = false;
-
@@ -2273,17 +2152,17 @@ diff --git a/content/public/browser/native_file_system_permission_context.h b/co
@@ -95,13 +95,6 @@ class NativeFileSystemPermissionContext {
base::OnceCallback callback) = 0;
- enum class SafeBrowsingResult { kAllow, kBlock };
-- // Runs a recently finished write operation through Safe Browsing code to
-- // determine if the write should be allowed or blocked.
-- virtual void PerformSafeBrowsingChecks(
+ enum class AfterWriteCheckResult { kAllow, kBlock };
+- // Runs a recently finished write operation through checks such as malware
+- // or other security checks to determine if the write should be allowed.
+- virtual void PerformAfterWriteChecks(
- std::unique_ptr item,
- int process_id,
- int frame_id,
-- base::OnceCallback callback) = 0;
+- base::OnceCallback callback) = 0;
// Returns whether the given |origin| is allowed to ask for write access.
// This is used to block save file dialogs from being shown
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-search-ready-omnibox-by-default.patch b/build/patches/Disable-search-ready-omnibox-by-default.patch
index 193d6ed1..541608f4 100644
--- a/build/patches/Disable-search-ready-omnibox-by-default.patch
+++ b/build/patches/Disable-search-ready-omnibox-by-default.patch
@@ -9,8 +9,8 @@ Subject: Disable search-ready omnibox by default
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -518,7 +518,7 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu",
- base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -518,7 +518,7 @@ const base::Feature kScrollToExpandPaymentHandler{
+ "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kSearchReadyOmniboxFeature{
- "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -19,5 +19,5 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
const base::Feature kServiceManagerForBackgroundPrefetch{
"ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT};
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-seed-based-field-trials.patch b/build/patches/Disable-seed-based-field-trials.patch
index e4675487..d09d3cd6 100644
--- a/build/patches/Disable-seed-based-field-trials.patch
+++ b/build/patches/Disable-seed-based-field-trials.patch
@@ -9,7 +9,7 @@ Subject: Disable seed-based field trials
diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
--- a/components/variations/service/variations_field_trial_creator.cc
+++ b/components/variations/service/variations_field_trial_creator.cc
-@@ -535,8 +535,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
+@@ -538,8 +538,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
#endif // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
bool used_seed = false;
if (!used_testing_config) {
@@ -21,5 +21,5 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
platform_field_trials->SetupFeatureControllingFieldTrials(used_seed,
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-some-signed-exchange-features.patch b/build/patches/Disable-some-signed-exchange-features.patch
index f3a077e5..3c947392 100644
--- a/build/patches/Disable-some-signed-exchange-features.patch
+++ b/build/patches/Disable-some-signed-exchange-features.patch
@@ -9,7 +9,7 @@ Subject: Disable some signed exchange features
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
-@@ -508,7 +508,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
+@@ -507,7 +507,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
// Signed Exchange Reporting for distributors
// https://www.chromestatus.com/features/5687904902840320
const base::Feature kSignedExchangeReportingForDistributors{
@@ -18,7 +18,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
// Subresource prefetching+loading via Signed HTTP Exchange
// https://www.chromestatus.com/features/5126805474246656
-@@ -518,7 +518,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
+@@ -517,7 +517,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
// Origin-Signed HTTP Exchanges (for WebPackage Loading)
// https://www.chromestatus.com/features/5745285984681984
const base::Feature kSignedHTTPExchange{"SignedHTTPExchange",
@@ -28,5 +28,5 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
// Whether to send a ping to the inner URL upon navigation or not.
const base::Feature kSignedHTTPExchangePingValidity{
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-sync-services-menu-entry.patch b/build/patches/Disable-sync-services-menu-entry.patch
index eb9e8119..ac83f595 100644
--- a/build/patches/Disable-sync-services-menu-entry.patch
+++ b/build/patches/Disable-sync-services-menu-entry.patch
@@ -40,5 +40,5 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
app:allowDividerBelow="false" />
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-third-party-cookies-by-default.patch b/build/patches/Disable-third-party-cookies-by-default.patch
index 3a344bad..7a9f71ad 100644
--- a/build/patches/Disable-third-party-cookies-by-default.patch
+++ b/build/patches/Disable-third-party-cookies-by-default.patch
@@ -10,7 +10,7 @@ author: Chad Miller
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
-@@ -57,7 +57,7 @@ void CookieSettings::GetCookieSettings(
+@@ -58,7 +58,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -20,5 +20,5 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
registry->RegisterIntegerPref(
prefs::kCookieControlsMode,
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-unified-consent-on-Android.patch b/build/patches/Disable-unified-consent-on-Android.patch
index 4be8a4fb..86a772ce 100644
--- a/build/patches/Disable-unified-consent-on-Android.patch
+++ b/build/patches/Disable-unified-consent-on-Android.patch
@@ -19,5 +19,5 @@ diff --git a/components/unified_consent/feature.cc b/components/unified_consent/
#else
base::FEATURE_ENABLED_BY_DEFAULT
--
-2.11.0
+2.17.1
diff --git a/build/patches/Disable-update-scheduler.patch b/build/patches/Disable-update-scheduler.patch
index 9dbfc155..b51c108a 100644
--- a/build/patches/Disable-update-scheduler.patch
+++ b/build/patches/Disable-update-scheduler.patch
@@ -3,7 +3,7 @@ Date: Sat, 27 Oct 2018 17:54:01 +0200
Subject: Disable update scheduler
---
- .../chromium/chrome/browser/component_updater/UpdateScheduler.java | 7 ++-----
+ .../chrome/browser/component_updater/UpdateScheduler.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
@@ -29,5 +29,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updat
\ No newline at end of file
+}
--
-2.11.0
+2.17.1
diff --git a/build/patches/Do-not-grant-notifications-to-default-search-engine.patch b/build/patches/Do-not-grant-notifications-to-default-search-engine.patch
index cf595284..6c05d339 100644
--- a/build/patches/Do-not-grant-notifications-to-default-search-engine.patch
+++ b/build/patches/Do-not-grant-notifications-to-default-search-engine.patch
@@ -4,8 +4,8 @@ Subject: Do not grant notifications to default search engine
Block gelocation by default instead of granting it for non-enterprise use cases (almost the totality of users)
---
- .../search_permissions/search_permissions_service.cc | 20 ++++++--------------
- chrome/common/chrome_features.cc | 2 +-
+ .../search_permissions_service.cc | 20 ++++++-------------
+ chrome/common/chrome_features.cc | 2 +-
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/chrome/browser/android/search_permissions/search_permissions_service.cc b/chrome/browser/android/search_permissions/search_permissions_service.cc
@@ -63,7 +63,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
-@@ -288,7 +288,7 @@ const base::FeatureParam kDnsOverHttpsTemplatesParam{
+@@ -311,7 +311,7 @@ const base::FeatureParam kDnsOverHttpsTemplatesParam{
#if defined(OS_ANDROID)
// Enable changing default downloads storage location on Android.
const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",
@@ -73,5 +73,5 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
// If enabled, Drive will use FCM for its invalidations.
--
-2.11.0
+2.17.1
diff --git a/build/patches/Do-not-ignore-download-location-prompt-setting.patch b/build/patches/Do-not-ignore-download-location-prompt-setting.patch
index 0bd22cd2..e9bc9e2f 100644
--- a/build/patches/Do-not-ignore-download-location-prompt-setting.patch
+++ b/build/patches/Do-not-ignore-download-location-prompt-setting.patch
@@ -6,7 +6,7 @@ Upstream has decided that it works as intended (https://bugs.chromium.org/p/chro
but users would like to decide where to save a file even when there is no SD card available;
do not skip the prompt in such cases.
---
- .../download/DownloadLocationDialogBridge.java | 73 +++++++---------------
+ .../DownloadLocationDialogBridge.java | 73 ++++++-------------
1 file changed, 21 insertions(+), 52 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
@@ -108,5 +108,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
switch (dialogType) {
case DownloadLocationDialogType.LOCATION_FULL:
--
-2.11.0
+2.17.1
diff --git a/build/patches/Do-not-record-UMA-for-network-errors.patch b/build/patches/Do-not-record-UMA-for-network-errors.patch
deleted file mode 100644
index 2f6c24e7..00000000
--- a/build/patches/Do-not-record-UMA-for-network-errors.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 27 Jul 2019 11:19:53 +0200
-Subject: Do not record UMA for network errors
-
----
- services/network/network_context.cc | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/services/network/network_context.cc b/services/network/network_context.cc
---- a/services/network/network_context.cc
-+++ b/services/network/network_context.cc
-@@ -393,23 +393,6 @@ class NetworkContext::ContextNetworkDelegate
- started);
- }
-
-- // Record network errors that HTTP requests complete with, including OK and
-- // ABORTED.
-- // TODO(mmenke): Seems like this really should be looking at HTTPS requests,
-- // too.
-- // TODO(mmenke): We should remove the main frame case from here, and move it
-- // into the consumer - the network service shouldn't know what a main frame
-- // is.
-- if (request->url().SchemeIs("http")) {
-- base::UmaHistogramSparse("Net.HttpRequestCompletionErrorCodes",
-- -net_error);
--
-- if (request->load_flags() & net::LOAD_MAIN_FRAME_DEPRECATED) {
-- base::UmaHistogramSparse(
-- "Net.HttpRequestCompletionErrorCodes.MainFrame", -net_error);
-- }
-- }
--
- ForwardProxyErrors(net_error);
- }
-
---
-2.11.0
-
diff --git a/build/patches/Do-not-store-passwords-by-default.patch b/build/patches/Do-not-store-passwords-by-default.patch
index b8416f94..c34c8adc 100644
--- a/build/patches/Do-not-store-passwords-by-default.patch
+++ b/build/patches/Do-not-store-passwords-by-default.patch
@@ -9,7 +9,7 @@ Subject: Do not store passwords by default
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
-@@ -202,10 +202,10 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -155,10 +155,10 @@ void PasswordManager::RegisterProfilePrefs(
registry->RegisterBooleanPref(prefs::kBlacklistedCredentialsNormalized,
false);
registry->RegisterBooleanPref(
@@ -23,5 +23,5 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
PrefRegistry::NO_REGISTRATION_FLAGS);
--
-2.11.0
+2.17.1
diff --git a/build/patches/Enable-changing-default-downloads-storage-location-by-default.patch b/build/patches/Enable-changing-default-downloads-storage-location-by-default.patch
index e1523e0f..9436a1a3 100644
--- a/build/patches/Enable-changing-default-downloads-storage-location-by-default.patch
+++ b/build/patches/Enable-changing-default-downloads-storage-location-by-default.patch
@@ -9,7 +9,7 @@ Subject: Enable changing default downloads storage location by default
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
-@@ -288,7 +288,7 @@ const base::FeatureParam kDnsOverHttpsTemplatesParam{
+@@ -311,7 +311,7 @@ const base::FeatureParam kDnsOverHttpsTemplatesParam{
#if defined(OS_ANDROID)
// Enable changing default downloads storage location on Android.
const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",
@@ -19,5 +19,5 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
// If enabled, Drive will use FCM for its invalidations.
--
-2.11.0
+2.17.1
diff --git a/build/patches/Enable-download-rename-option-by-default.patch b/build/patches/Enable-download-rename-option-by-default.patch
index ff666435..ec111b60 100644
--- a/build/patches/Enable-download-rename-option-by-default.patch
+++ b/build/patches/Enable-download-rename-option-by-default.patch
@@ -9,7 +9,7 @@ Subject: Enable download rename option by default
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -421,7 +421,7 @@ const base::Feature kDownloadNotificationBadge{
+@@ -414,7 +414,7 @@ const base::Feature kDownloadNotificationBadge{
"DownloadNotificationBadge", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kDownloadRename{"DownloadRename",
@@ -19,5 +19,5 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
const base::Feature kDownloadTabManagementModule{
"DownloadTabManagementModule", base::FEATURE_DISABLED_BY_DEFAULT};
--
-2.11.0
+2.17.1
diff --git a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
index afbfc111..737fff29 100644
--- a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
+++ b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
@@ -42,7 +42,7 @@ Excerpt from https://github.com/bromite/bromite/issues/226
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -282,6 +282,10 @@ config("compiler") {
+@@ -297,6 +297,10 @@ config("compiler") {
}
}
@@ -54,5 +54,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
!is_mac && !is_ios && current_os != "aix") {
--
-2.11.0
+2.17.1
diff --git a/build/patches/Enable-night-mode-menu-entry-by-default.patch b/build/patches/Enable-night-mode-menu-entry-by-default.patch
index d4150560..6f8bfdc8 100644
--- a/build/patches/Enable-night-mode-menu-entry-by-default.patch
+++ b/build/patches/Enable-night-mode-menu-entry-by-default.patch
@@ -19,5 +19,5 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
const base::Feature kAndroidNightModeCCT{"AndroidNightModeCCT",
base::FEATURE_ENABLED_BY_DEFAULT};
--
-2.11.0
+2.17.1
diff --git a/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch b/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
index e79d0a96..75ca7646 100644
--- a/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
+++ b/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
@@ -9,7 +9,7 @@ Subject: Enable site per process isolation for devices with enough memory
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
-@@ -617,11 +617,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
+@@ -651,11 +651,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
// browser_features, as they are only used on the browser side.
const base::Feature kSitePerProcess {
"site-per-process",
@@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
};
// Controls a mode for dynamically process-isolating sites where the user has
-@@ -643,7 +639,7 @@ const base::Feature kSiteIsolationForPasswordSites{
+@@ -685,7 +681,7 @@ const base::Feature kSiteIsolationForPasswordSites{
// base::SysInfo::AmountOfPhysicalMemoryMB().
const base::Feature kSitePerProcessOnlyForHighMemoryClients{
"site-per-process-only-for-high-memory-clients",
@@ -31,5 +31,5 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
"site-per-process-low-memory-cutoff-mb";
--
-2.11.0
+2.17.1
diff --git a/build/patches/Fix-crash-when-accessing-page-info-site-settings.patch b/build/patches/Fix-crash-when-accessing-page-info-site-settings.patch
index 93826954..656cb7d1 100644
--- a/build/patches/Fix-crash-when-accessing-page-info-site-settings.patch
+++ b/build/patches/Fix-crash-when-accessing-page-info-site-settings.patch
@@ -20,5 +20,5 @@ diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/p
render_frame_host, canonical_requesting_origin.GetOrigin(),
embedding_origin.GetOrigin());
--
-2.11.0
+2.17.1
diff --git a/build/patches/Hide-passwords-manager-link.patch b/build/patches/Hide-passwords-manager-link.patch
index a18c3a4b..9ed54e26 100644
--- a/build/patches/Hide-passwords-manager-link.patch
+++ b/build/patches/Hide-passwords-manager-link.patch
@@ -3,7 +3,7 @@ Date: Sun, 13 Aug 2017 19:33:04 -0400
Subject: Hide passwords manager link
---
- .../chrome/browser/preferences/password/SavePasswordsPreferences.java | 4 ++--
+ .../preferences/password/SavePasswordsPreferences.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
@@ -28,5 +28,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pas
PreferenceCategory profileCategory = new PreferenceCategory(getStyledContext());
profileCategory.setKey(PREF_KEY_CATEGORY_EXCEPTIONS);
--
-2.11.0
+2.17.1
diff --git a/build/patches/Hide-send-reports-checkbox.patch b/build/patches/Hide-send-reports-checkbox.patch
index 9e9a6c6b..0d977eb3 100644
--- a/build/patches/Hide-send-reports-checkbox.patch
+++ b/build/patches/Hide-send-reports-checkbox.patch
@@ -19,5 +19,5 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
--
-2.11.0
+2.17.1
diff --git a/build/patches/Increase-number-of-autocomplete-matches-from-5-to-10.patch b/build/patches/Increase-number-of-autocomplete-matches-from-5-to-10.patch
index f8220063..d9a64219 100644
--- a/build/patches/Increase-number-of-autocomplete-matches-from-5-to-10.patch
+++ b/build/patches/Increase-number-of-autocomplete-matches-from-5-to-10.patch
@@ -4,37 +4,27 @@ Subject: Increase number of autocomplete matches from 5 to 10
Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526874703
---
- components/omnibox/browser/autocomplete_result.cc | 7 ++-----
+ components/omnibox/browser/autocomplete_result.cc | 3 ++-
components/omnibox/browser/omnibox_field_trial.cc | 3 ++-
- 2 files changed, 4 insertions(+), 6 deletions(-)
+ 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
--- a/components/omnibox/browser/autocomplete_result.cc
+++ b/components/omnibox/browser/autocomplete_result.cc
-@@ -48,17 +48,14 @@ struct MatchGURLHash {
+@@ -74,7 +74,8 @@ struct MatchGURLHash {
// static
size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) {
#if (defined(OS_ANDROID))
- constexpr size_t kDefaultMaxAutocompleteMatches = 5;
-+ constexpr size_t kDefaultMaxAutocompleteMatches = 10; // was 6, this needs to be double the value of default_max_matches_per_provider from components/omnibox/browser/omnibox_field_trial.cc
++ // changed from 6, this needs to be double the value of default_max_matches_per_provider from components/omnibox/browser/omnibox_field_trial.cc
++ constexpr size_t kDefaultMaxAutocompleteMatches = 10;
if (is_zero_suggest)
return kDefaultMaxAutocompleteMatches;
#else
- constexpr size_t kDefaultMaxAutocompleteMatches = 6;
- #endif // defined(OS_ANDROID)
-
-- return base::GetFieldTrialParamByFeatureAsInt(
-- omnibox::kUIExperimentMaxAutocompleteMatches,
-- OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam,
-- kDefaultMaxAutocompleteMatches);
-+ return kDefaultMaxAutocompleteMatches;
- }
-
- AutocompleteResult::AutocompleteResult() {
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
--- a/components/omnibox/browser/omnibox_field_trial.cc
+++ b/components/omnibox/browser/omnibox_field_trial.cc
-@@ -321,7 +321,8 @@ void OmniboxFieldTrial::GetDemotionsByType(
+@@ -329,7 +329,8 @@ void OmniboxFieldTrial::GetDemotionsByType(
size_t OmniboxFieldTrial::GetProviderMaxMatches(
AutocompleteProvider::Type provider) {
@@ -45,5 +35,5 @@ diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omni
std::string param_value = base::GetFieldTrialParamValueByFeature(
omnibox::kUIExperimentMaxAutocompleteMatches,
--
-2.11.0
+2.17.1
diff --git a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch
index b73c658a..e025098b 100644
--- a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch
+++ b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch
@@ -7,13 +7,13 @@ Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com to al
Set proper injection script nonce
Send a random key press to circumvent idle status detection
---
- third_party/blink/renderer/core/dom/BUILD.gn | 2 +
- third_party/blink/renderer/core/dom/document.cc | 60 +++++++++++++++++++++-
- third_party/blink/renderer/core/dom/document.h | 2 +
- .../renderer/core/dom/extensions/anti_amp_cure.h | 6 +++
- .../renderer/core/dom/extensions/video_bg_play.h | 6 +++
- .../renderer/core/html/html_script_element.cc | 5 ++
- .../blink/renderer/core/html/html_script_element.h | 1 +
+ third_party/blink/renderer/core/dom/BUILD.gn | 2 +
+ .../blink/renderer/core/dom/document.cc | 60 ++++++++++++++++++-
+ .../blink/renderer/core/dom/document.h | 2 +
+ .../core/dom/extensions/anti_amp_cure.h | 6 ++
+ .../core/dom/extensions/video_bg_play.h | 6 ++
+ .../renderer/core/html/html_script_element.cc | 5 ++
+ .../renderer/core/html/html_script_element.h | 1 +
7 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
create mode 100644 third_party/blink/renderer/core/dom/extensions/video_bg_play.h
@@ -21,7 +21,7 @@ Send a random key press to circumvent idle status detection
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
-@@ -146,6 +146,8 @@ blink_core_sources("dom") {
+@@ -144,6 +144,8 @@ blink_core_sources("dom") {
"global_event_handlers.h",
"icon_url.cc",
"icon_url.h",
@@ -33,7 +33,7 @@ diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/re
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
-@@ -254,6 +254,7 @@
+@@ -257,6 +257,7 @@
#include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h"
#include "third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h"
#include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
@@ -41,7 +41,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
#include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
#include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor.h"
#include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
-@@ -319,6 +320,8 @@
+@@ -321,6 +322,8 @@
#include "third_party/blink/renderer/platform/wtf/text/string_buffer.h"
#include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
@@ -50,7 +50,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
#ifndef NDEBUG
using WeakDocumentSet = blink::HeapHashSet>;
static WeakDocumentSet& liveDocumentSet();
-@@ -6688,8 +6691,63 @@ void Document::FinishedParsing() {
+@@ -6664,8 +6667,63 @@ void Document::FinishedParsing() {
// Parser should have picked up all preloads by now
fetcher_->ClearPreloads(ResourceFetcher::kClearSpeculativeMarkupPreloads);
@@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
-@@ -1641,6 +1641,8 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1663,6 +1663,8 @@ class CORE_EXPORT Document : public ContainerNode,
void AddAXContext(AXContext*);
void RemoveAXContext(AXContext*);
@@ -176,5 +176,5 @@ diff --git a/third_party/blink/renderer/core/html/html_script_element.h b/third_
void setAsync(bool);
bool async() const;
--
-2.11.0
+2.17.1
diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch
index f2e53098..1fdfc3c3 100644
--- a/build/patches/Modify-default-preferences.patch
+++ b/build/patches/Modify-default-preferences.patch
@@ -4,27 +4,27 @@ Subject: Modify default preferences
Do not hide component extensions
---
- chrome/browser/background/background_mode_manager.cc | 2 +-
- chrome/browser/chrome_content_browser_client.cc | 2 +-
- chrome/browser/net/prediction_options.cc | 2 +-
- chrome/browser/net/prediction_options.h | 2 +-
- chrome/browser/profiles/profile.cc | 2 +-
- .../settings/reset_page/reset_profile_dialog.html | 2 +-
- chrome/browser/ui/browser_ui_prefs.cc | 4 ++--
- chrome/browser/ui/navigation_correction_tab_observer.cc | 2 +-
- .../browser/ui/webui/local_discovery/local_discovery_ui.cc | 4 ----
- chrome/service/cloud_print/connector_settings.cc | 2 +-
- components/autofill/core/browser/autofill_manager.cc | 14 ++++----------
- components/autofill/core/common/autofill_prefs.cc | 2 +-
- components/bookmarks/browser/bookmark_utils.cc | 4 ++--
- components/safe_browsing/common/safe_browsing_prefs.cc | 4 ++--
- extensions/common/extension.cc | 8 --------
+ .../browser/background/background_mode_manager.cc | 2 +-
+ chrome/browser/chrome_content_browser_client.cc | 2 +-
+ chrome/browser/net/prediction_options.cc | 2 +-
+ chrome/browser/net/prediction_options.h | 2 +-
+ chrome/browser/profiles/profile.cc | 2 +-
+ .../settings/reset_page/reset_profile_dialog.html | 2 +-
+ chrome/browser/ui/browser_ui_prefs.cc | 4 ++--
+ .../ui/navigation_correction_tab_observer.cc | 2 +-
+ .../ui/webui/local_discovery/local_discovery_ui.cc | 4 ----
+ chrome/service/cloud_print/connector_settings.cc | 2 +-
+ .../autofill/core/browser/autofill_manager.cc | 14 ++++----------
+ components/autofill/core/common/autofill_prefs.cc | 2 +-
+ components/bookmarks/browser/bookmark_utils.cc | 4 ++--
+ .../safe_browsing/common/safe_browsing_prefs.cc | 4 ++--
+ extensions/common/extension.cc | 8 --------
15 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
-@@ -301,7 +301,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -302,7 +302,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
-@@ -1150,7 +1150,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1141,7 +1141,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -72,7 +72,7 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
-@@ -140,7 +140,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
+@@ -149,7 +149,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
@@ -96,7 +96,7 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
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
-@@ -66,11 +66,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -67,11 +67,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
@@ -113,7 +113,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -42,7 +42,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {}
+@@ -43,7 +43,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {}
// static
void NavigationCorrectionTabObserver::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* prefs) {
@@ -151,7 +151,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
-@@ -516,10 +516,7 @@ bool AutofillManager::ShouldParseForms(const std::vector& forms,
+@@ -529,10 +529,7 @@ bool AutofillManager::ShouldParseForms(const std::vector& forms,
bool enabled = IsAutofillEnabled();
sync_state_ = personal_data_ ? personal_data_->GetSyncSigninState()
: AutofillSyncSigninState::kNumSyncStates;
@@ -163,7 +163,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
return enabled;
}
-@@ -803,10 +800,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
+@@ -818,10 +815,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
// suggestions available.
// TODO(mathp): Differentiate between number of suggestions available
// (current metric) and number shown to the user.
@@ -175,7 +175,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
}
}
-@@ -1427,8 +1421,8 @@ void AutofillManager::Reset() {
+@@ -1450,8 +1444,8 @@ void AutofillManager::Reset() {
#if defined(OS_ANDROID) || defined(OS_IOS)
autofill_assistant_.Reset();
#endif
@@ -189,7 +189,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -150,7 +150,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -152,7 +152,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
@@ -201,7 +201,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -443,12 +443,12 @@ bool DoesBookmarkContainWords(const base::string16& title,
+@@ -439,12 +439,12 @@ bool DoesBookmarkContainWords(const base::string16& title,
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kShowBookmarkBar,
@@ -219,7 +219,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
-@@ -167,9 +167,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -169,9 +169,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(
prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
registry->RegisterBooleanPref(
@@ -250,5 +250,5 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
// show packaged apps and platform apps because there are some pieces of
// functionality that are only available in chrome://extensions/ but which
--
-2.11.0
+2.17.1
diff --git a/build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch b/build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch
index e395814b..5b99da66 100644
--- a/build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch
+++ b/build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch
@@ -25,30 +25,30 @@ approach to change color components.
Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data fingerprinting deception
---
- chrome/browser/BUILD.gn | 1 +
- chrome/browser/about_flags.cc | 13 ++
- content/browser/BUILD.gn | 1 +
- .../renderer_host/render_process_host_impl.cc | 4 +
- content/child/BUILD.gn | 1 +
- content/child/runtime_features.cc | 8 ++
- .../blink/public/platform/web_runtime_features.h | 3 +
- third_party/blink/renderer/core/dom/document.cc | 18 +++
- third_party/blink/renderer/core/dom/document.h | 7 +
- third_party/blink/renderer/core/dom/element.cc | 8 ++
- third_party/blink/renderer/core/dom/range.cc | 12 +-
- .../renderer/core/html/canvas/text_metrics.cc | 18 +++
- .../blink/renderer/core/html/canvas/text_metrics.h | 2 +
- .../canvas/canvas2d/canvas_rendering_context_2d.cc | 8 +-
- .../modules/webgl/webgl_debug_renderer_info.cc | 4 +-
- third_party/blink/renderer/platform/BUILD.gn | 5 +-
- .../platform/exported/web_runtime_features.cc | 12 ++
- .../platform/graphics/image_data_buffer.cc | 7 +
- .../platform/graphics/static_bitmap_image.cc | 159 +++++++++++++++++++++
- .../platform/graphics/static_bitmap_image.h | 2 +
- .../platform/runtime_enabled_features.json5 | 9 ++
- third_party/ungoogled/BUILD.gn | 10 ++
- third_party/ungoogled/ungoogled_switches.cc | 18 +++
- third_party/ungoogled/ungoogled_switches.h | 18 +++
+ chrome/browser/BUILD.gn | 1 +
+ chrome/browser/about_flags.cc | 13 ++
+ content/browser/BUILD.gn | 1 +
+ .../renderer_host/render_process_host_impl.cc | 4 +
+ content/child/BUILD.gn | 1 +
+ content/child/runtime_features.cc | 8 +
+ .../public/platform/web_runtime_features.h | 3 +
+ .../blink/renderer/core/dom/document.cc | 18 ++
+ .../blink/renderer/core/dom/document.h | 7 +
+ .../blink/renderer/core/dom/element.cc | 8 +
+ third_party/blink/renderer/core/dom/range.cc | 12 +-
+ .../renderer/core/html/canvas/text_metrics.cc | 18 ++
+ .../renderer/core/html/canvas/text_metrics.h | 2 +
+ .../canvas2d/canvas_rendering_context_2d.cc | 8 +-
+ .../webgl/webgl_debug_renderer_info.cc | 4 +-
+ third_party/blink/renderer/platform/BUILD.gn | 5 +-
+ .../platform/exported/web_runtime_features.cc | 12 ++
+ .../platform/graphics/image_data_buffer.cc | 7 +
+ .../platform/graphics/static_bitmap_image.cc | 159 ++++++++++++++++++
+ .../platform/graphics/static_bitmap_image.h | 2 +
+ .../platform/runtime_enabled_features.json5 | 9 +
+ third_party/ungoogled/BUILD.gn | 10 ++
+ third_party/ungoogled/ungoogled_switches.cc | 18 ++
+ third_party/ungoogled/ungoogled_switches.h | 18 ++
24 files changed, 343 insertions(+), 5 deletions(-)
create mode 100644 third_party/ungoogled/BUILD.gn
create mode 100644 third_party/ungoogled/ungoogled_switches.cc
@@ -57,7 +57,7 @@ Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
-@@ -2200,6 +2200,7 @@ jumbo_split_static_library("browser") {
+@@ -2144,6 +2144,7 @@ jumbo_static_library("browser") {
"//third_party/metrics_proto",
"//third_party/re2",
"//third_party/smhasher:cityhash",
@@ -69,14 +69,14 @@ 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
@@ -147,6 +147,7 @@
+ #include "third_party/blink/public/common/experiments/memory_ablation_experiment.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/forcedark/forcedark_switches.h"
- #include "third_party/leveldatabase/leveldb_features.h"
+#include "third_party/ungoogled/ungoogled_switches.h"
+ #include "third_party/leveldatabase/leveldb_features.h"
+ #include "ui/accessibility/accessibility_features.h"
#include "ui/accessibility/accessibility_switches.h"
- #include "ui/base/ui_base_features.h"
- #include "ui/base/ui_base_switches.h"
-@@ -1405,12 +1406,24 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1466,12 +1467,24 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName,
flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll,
SINGLE_VALUE_TYPE(switches::kEnableWebRtcSrtpAesGcm)},
@@ -115,7 +115,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -213,6 +213,7 @@
+@@ -220,6 +220,7 @@
#include "third_party/blink/public/common/page/launching_process_state.h"
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
#include "third_party/blink/public/public_buildflags.h"
@@ -123,22 +123,22 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/accessibility/accessibility_switches.h"
#include "ui/base/ui_base_switches.h"
-@@ -2970,6 +2971,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
- switches::kEnableWebGLSwapChain,
- switches::kEnableWebVR,
- switches::kFileUrlPathAlias,
+@@ -2977,6 +2978,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+ switches::kDisablePreferCompositingToLCDText,
+ switches::kDisableDatabases,
+ switches::kDisableFileSystem,
+ switches::kFingerprintingClientRectsNoise,
+ switches::kFingerprintingCanvasMeasureTextNoise,
+ switches::kFingerprintingCanvasImageDataNoise,
- switches::kForceDisplayColorProfile,
- switches::kForceDeviceScaleFactor,
- switches::kForceGpuMemAvailableMb,
+ switches::kDisableFrameRateLimit,
+ switches::kDisableGpuMemoryBufferVideoFrames,
+ switches::kDisableImageAnimationResync,
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
-@@ -120,6 +120,7 @@ target(link_target_type, "child") {
- "//third_party/blink/public:scaled_resources",
+@@ -123,6 +123,7 @@ target(link_target_type, "child") {
"//third_party/blink/public/common",
+ "//third_party/blink/public/strings",
"//third_party/ced",
+ "//third_party/ungoogled:switches",
"//third_party/zlib/google:compression_utils",
@@ -149,15 +149,15 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
+++ b/content/child/runtime_features.cc
@@ -23,6 +23,7 @@
#include "services/network/public/cpp/features.h"
+ #include "services/network/public/cpp/network_switches.h"
#include "third_party/blink/public/common/features.h"
- #include "third_party/blink/public/platform/web_runtime_features.h"
+#include "third_party/ungoogled/ungoogled_switches.h"
+ #include "third_party/blink/public/platform/web_runtime_features.h"
+ #include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
- #include "ui/events/blink/blink_features.h"
- #include "ui/gfx/switches.h"
-@@ -461,6 +462,13 @@ void SetIndividualRuntimeFeatures(
- WebRuntimeFeatures::EnableAllowSyncXHRInPageDismissal(true);
- }
+@@ -513,6 +514,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+ if (ui::IsOverlayScrollbarEnabled())
+ WebRuntimeFeatures::EnableOverlayScrollbars(true);
+ WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(
+ !command_line.HasSwitch(switches::kFingerprintingClientRectsNoise));
@@ -166,13 +166,13 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
+ WebRuntimeFeatures::EnableFingerprintingCanvasImageDataNoise(
+ !command_line.HasSwitch(switches::kFingerprintingCanvasImageDataNoise));
+
- WebRuntimeFeatures::EnableAutoplayIgnoresWebAudio(
- base::FeatureList::IsEnabled(media::kAutoplayIgnoreWebAudio));
+ WebRuntimeFeatures::EnableFormControlsRefresh(
+ features::IsFormControlsRefreshEnabled());
diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -228,6 +228,9 @@ class WebRuntimeFeatures {
+@@ -229,6 +229,9 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableMergeBlockingNonBlockingPools(bool);
BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
@@ -193,9 +193,9 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
#include "base/time/time.h"
#include "cc/input/overscroll_behavior.h"
#include "cc/input/scroll_snap_data.h"
-@@ -1199,6 +1200,15 @@ Document::Document(const DocumentInit& initializer,
- #ifndef NDEBUG
- liveDocumentSet().insert(this);
+@@ -2794,6 +2795,23 @@ void Document::UpdateStyleAndLayoutTree() {
+ #if DCHECK_IS_ON()
+ AssertLayoutTreeUpdated(*this);
#endif
+
+ if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
@@ -206,28 +206,21 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
+ noise_factor_x_ = 1;
+ noise_factor_y_ = 1;
+ }
- }
-
- Document::~Document() {
-@@ -1227,6 +1237,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
- Position::BeforeNode(*shadow_host));
- }
-
++}
++
+double Document::GetNoiseFactorX() {
+ return noise_factor_x_;
+}
+
+double Document::GetNoiseFactorY() {
+ return noise_factor_y_;
-+}
-+
- SelectorQueryCache& Document::GetSelectorQueryCache() {
- if (!selector_query_cache_)
- selector_query_cache_ = std::make_unique();
+ }
+
+ void Document::UpdateActiveStyle() {
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,10 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -414,6 +414,10 @@ class CORE_EXPORT Document : public ContainerNode,
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -238,7 +231,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
String visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
-@@ -1905,6 +1909,9 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1936,6 +1940,9 @@ class CORE_EXPORT Document : public ContainerNode,
base::ElapsedTimer start_time_;
@@ -251,7 +244,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -1630,6 +1630,11 @@ DOMRectList* Element::getClientRects() {
+@@ -1877,6 +1877,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
quads, *element_layout_object);
@@ -263,7 +256,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
return DOMRectList::Create(quads);
}
-@@ -1647,6 +1652,9 @@ DOMRect* Element::getBoundingClientRect() {
+@@ -1894,6 +1899,9 @@ DOMRect* Element::getBoundingClientRect() {
DCHECK(element_layout_object);
GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -342,7 +335,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_
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
-@@ -811,9 +811,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+@@ -818,9 +818,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
else
direction = ToTextDirection(GetState().GetDirection(), canvas());
@@ -379,7 +372,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1417,7 +1417,9 @@ jumbo_component("platform") {
+@@ -1454,7 +1454,9 @@ jumbo_component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -390,18 +383,18 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
public_deps = [
":blink_platform_public_deps",
-@@ -1450,6 +1452,7 @@ jumbo_component("platform") {
+@@ -1487,6 +1489,7 @@ jumbo_component("platform") {
+ "//third_party/blink/public/common",
+ "//third_party/blink/public/mojom:embedded_frame_sink_mojo_bindings_blink",
"//third_party/ced",
++ "//third_party/ungoogled:switches",
"//third_party/emoji-segmenter",
"//third_party/icu",
-+ "//third_party/ungoogled:switches",
- "//third_party/webrtc/api:libjingle_logging_api",
- "//third_party/webrtc/api/audio_codecs/L16:audio_decoder_L16",
- "//third_party/webrtc/api/audio_codecs/L16:audio_encoder_L16",
+ "//third_party/libyuv",
diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -722,4 +722,16 @@ void WebRuntimeFeatures::EnableAcceleratedSmallCanvases(bool enable) {
+@@ -704,4 +704,16 @@ void WebRuntimeFeatures::EnableAcceleratedSmallCanvases(bool enable) {
RuntimeEnabledFeatures::SetAcceleratedSmallCanvasesEnabled(enable);
}
@@ -469,7 +462,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
#include "v8/include/v8.h"
namespace blink {
-@@ -154,10 +158,165 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
+@@ -141,10 +145,165 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
DCHECK(read_pixels_successful ||
!sk_image->bounds().intersect(SkIRect::MakeXYWH(
rect.X(), rect.Y(), info.width(), info.height())));
@@ -638,8 +631,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
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 Create(WTF::ArrayBufferContents&,
+@@ -44,6 +44,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
+ static scoped_refptr Create(sk_sp data,
const SkImageInfo&);
+ static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
@@ -650,9 +643,9 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -677,6 +677,15 @@
- name: "FileSystem",
- status: "stable",
+@@ -683,6 +683,15 @@
+ name: "FetchMetadataDestination",
+ status: "experimental"
},
+ {
+ name: "FingerprintingClientRectsNoise",
@@ -663,9 +656,9 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+ {
+ name: "FingerprintingCanvasImageDataNoise",
+ },
- // FirstContentfulPaintPlusPlus enables the Largest Text Paint metric, Last
- // Text Paint metric, Largest Image Paint metric and Last Image Paint
- // metric. See also: http://bit.ly/fcp_plus_plus
+ {
+ name: "FileHandling",
+ // NativeFileSystem is in Origin Trial, which doesn't support having
diff --git a/third_party/ungoogled/BUILD.gn b/third_party/ungoogled/BUILD.gn
new file mode 100644
--- /dev/null
@@ -728,5 +721,5 @@ new file mode 100644
+
+#endif // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
--
-2.11.0
+2.17.1
diff --git a/build/patches/Never-fetch-popular-sites.patch b/build/patches/Never-fetch-popular-sites.patch
index 997ac1ca..2cac3a2d 100644
--- a/build/patches/Never-fetch-popular-sites.patch
+++ b/build/patches/Never-fetch-popular-sites.patch
@@ -23,5 +23,5 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
const base::TimeDelta time_since_last_download =
--
-2.11.0
+2.17.1
diff --git a/build/patches/Never-send-any-crash-upload-data.patch b/build/patches/Never-send-any-crash-upload-data.patch
index 585c8d8f..6c785ab7 100644
--- a/build/patches/Never-send-any-crash-upload-data.patch
+++ b/build/patches/Never-send-any-crash-upload-data.patch
@@ -20,5 +20,5 @@ diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/t
progress_callback_ = progress_callback;
--
-2.11.0
+2.17.1
diff --git a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch
index edf3aa16..5f5a798c 100644
--- a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch
+++ b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch
@@ -3,21 +3,21 @@ Date: Sun, 28 Oct 2018 14:11:50 +0100
Subject: Offer builtin autocomplete for chrome://flags
---
- chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc | 2 ++
+ .../browser/autocomplete/chrome_autocomplete_provider_client.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -255,6 +255,8 @@ std::vector
+@@ -254,6 +254,8 @@ std::vector ChromeAutocompleteProviderClient::GetBuiltinURLs() {
+ std::vector
ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
std::vector builtins_to_provide;
- builtins_to_provide.push_back(
-+ base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
+ builtins_to_provide.push_back(
++ base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
+ builtins_to_provide.push_back(
base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
#if !defined(OS_ANDROID)
- builtins_to_provide.push_back(
--
-2.11.0
+2.17.1
diff --git a/build/patches/Open-YouTube-links-in-Bromite.patch b/build/patches/Open-YouTube-links-in-Bromite.patch
index 0146187b..8e7a99e7 100644
--- a/build/patches/Open-YouTube-links-in-Bromite.patch
+++ b/build/patches/Open-YouTube-links-in-Bromite.patch
@@ -3,26 +3,34 @@ 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(+)
+ .../browser/externalnav/ExternalNavigationHandler.java | 8 ++++++++
+ 1 file changed, 8 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
-@@ -402,6 +402,13 @@ public class ExternalNavigationHandler {
+@@ -402,6 +402,7 @@ public class ExternalNavigationHandler {
+ Uri.parse(WebView.SCHEME_TEL
+ + params.getUrl().substring(WTAI_MC_URL_PREFIX.length()))),
+ false);
++
+ if (DEBUG) Log.i(TAG, "wtai:// link handled");
+ RecordUserAction.record("Android.PhoneIntent");
+ return true;
+@@ -745,6 +746,13 @@ public class ExternalNavigationHandler {
+ return OverrideUrlLoadingResult.OVERRIDE_WITH_ASYNC_ACTION;
}
- // TODO(changwan): check if we need to handle URL even when external intent is off.
-+ // Force to open YouTube urls in Bromite
-+ String intentPackageName = intent.getPackage();
++ // force to open YouTube urls in Bromite
++ String intentPackageName = targetIntent.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;
+ }
+
- if (CommandLine.getInstance().hasSwitch(
- ChromeSwitches.DISABLE_EXTERNAL_INTENT_REQUESTS)) {
- Log.w(TAG, "External intent handling is disabled by a command-line flag.");
+ // This should come after file intents, but before any returns of
+ // OVERRIDE_WITH_EXTERNAL_INTENT.
+ if (externalIntentRequestsDisabled()) return OverrideUrlLoadingResult.NO_OVERRIDE;
--
-2.11.0
+2.17.1
diff --git a/build/patches/Punt-the-Widevine-version-string.patch b/build/patches/Punt-the-Widevine-version-string.patch
deleted file mode 100644
index 668bb08d..00000000
--- a/build/patches/Punt-the-Widevine-version-string.patch
+++ /dev/null
@@ -1,24 +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 | 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
-@@ -517,7 +517,7 @@ void ChromeContentClient::AddContentDecryptionModules(
- base::FilePath cdm_path;
- content::CdmCapability capability;
- if (IsWidevineAvailable(&cdm_path, &capability)) {
-- const base::Version version(WIDEVINE_CDM_VERSION_STRING);
-+ const base::Version version("1.0.123.456");
- DCHECK(version.IsValid());
-
- cdms->push_back(
---
-2.11.0
-
diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
new file mode 100644
index 00000000..5da27c75
--- /dev/null
+++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
@@ -0,0 +1,102 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 28 Apr 2018 08:30:26 +0200
+Subject: Reduce HTTP headers in DoH requests to bare minimum
+
+Serve DoH requests with maximum priority.
+---
+ net/base/load_flags_list.h | 6 ++++++
+ net/dns/dns_transaction.cc | 3 ++-
+ net/url_request/url_request_http_job.cc | 16 +++++++++++-----
+ 3 files changed, 19 insertions(+), 6 deletions(-)
+
+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
+@@ -106,6 +106,12 @@ LOAD_FLAG(SUPPORT_ASYNC_REVALIDATION, 1 << 16)
+ // the LOAD_CAN_USE_RESTRICTED_PREFETCH load flag.
+ LOAD_FLAG(RESTRICTED_PREFETCH, 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)
++
+ // This flag must be set on requests that are allowed to reuse cache entries
+ // that are marked as RESTRICTED_PREFETCH. Requests without this flag cannot
+ // reuse restricted prefetch responses in the cache. Restricted response reuse
+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
+@@ -403,6 +403,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
+ // perspective to prevent the client from sending AIA requests).
+ request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
+ LOAD_BYPASS_PROXY |
++ LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
+ LOAD_DISABLE_CERT_NETWORK_FETCHES);
+ request_->set_allow_credentials(false);
+ }
+@@ -1004,7 +1005,7 @@ class DnsTransactionImpl : public DnsTransaction,
+ had_tcp_attempt_(false),
+ first_server_index_(0),
+ url_request_context_(url_request_context),
+- 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
+@@ -354,6 +354,7 @@ void URLRequestHttpJob::Start() {
+ // plugin could set a referrer although sending the referrer is inhibited.
+ request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
+
++ if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
+ // Our consumer should have made sure that this is a safe referrer. See for
+ // instance WebCore::FrameLoader::HideReferrer.
+ if (referrer.is_valid()) {
+@@ -369,11 +370,14 @@ void URLRequestHttpJob::Start() {
+ request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
+ referer_value);
+ }
++ }
+
++ 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();
+@@ -588,10 +592,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
+ } else {
+ // 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;
++ }
+ }
+ }
+
+@@ -609,7 +615,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
+ }
+ }
+
+- 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.17.1
+
diff --git a/build/patches/Remove-EV-certificates.patch b/build/patches/Remove-EV-certificates.patch
index 4b646414..4d560c57 100644
--- a/build/patches/Remove-EV-certificates.patch
+++ b/build/patches/Remove-EV-certificates.patch
@@ -97,5 +97,5 @@ diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h
// RegisterOID registers |policy|, a policy OID in dotted string form, and
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-SMS-integration.patch b/build/patches/Remove-SMS-integration.patch
index 94e64634..129e8b56 100644
--- a/build/patches/Remove-SMS-integration.patch
+++ b/build/patches/Remove-SMS-integration.patch
@@ -3,15 +3,15 @@ Date: Sun, 3 Nov 2019 08:22:29 +0100
Subject: Remove SMS integration
---
- content/public/android/BUILD.gn | 2 -
- .../org/chromium/content/browser/sms/Wrappers.java | 74 ----------------------
+ content/public/android/BUILD.gn | 2 -
+ .../content/browser/sms/Wrappers.java | 74 -------------------
2 files changed, 76 deletions(-)
delete mode 100644 content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
-@@ -231,8 +231,6 @@ android_library("content_java") {
+@@ -232,8 +232,6 @@ android_library("content_java") {
"java/src/org/chromium/content/browser/selection/SmartSelectionClient.java",
"java/src/org/chromium/content/browser/selection/SmartSelectionMetricsLogger.java",
"java/src/org/chromium/content/browser/selection/SmartSelectionProvider.java",
@@ -100,5 +100,5 @@ deleted file mode 100644
- }
-}
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-background-sync-and-translate-menu-options.patch b/build/patches/Remove-background-sync-and-translate-menu-options.patch
index 8442176b..5244b7a5 100644
--- a/build/patches/Remove-background-sync-and-translate-menu-options.patch
+++ b/build/patches/Remove-background-sync-and-translate-menu-options.patch
@@ -3,8 +3,8 @@ Date: Wed, 22 Mar 2017 19:10:30 -0400
Subject: Remove background sync and translate menu options
---
- chrome/android/java/res/xml/site_settings_preferences.xml | 4 ----
- .../chrome/browser/preferences/website/SiteSettingsPreferences.java | 3 +--
+ chrome/android/java/res/xml/site_settings_preferences.xml | 4 ----
+ .../browser/preferences/website/SiteSettingsPreferences.java | 3 +--
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
@@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/
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
-@@ -73,7 +73,7 @@ public class SiteSettingsPreferences
+@@ -72,7 +72,7 @@ public class SiteSettingsPreferences
// The Media sub-menu only contains Protected Content and Autoplay, so remove all other
// menus.
for (@Type int i = 0; i < Type.NUM_ENTRIES; i++) {
@@ -33,14 +33,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
getPreferenceScreen().removePreference(findPreference(i));
}
getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
-@@ -111,7 +111,6 @@ public class SiteSettingsPreferences
+@@ -106,7 +106,6 @@ public class SiteSettingsPreferences
websitePrefs.add(Type.ADS);
}
websitePrefs.add(Type.AUTOMATIC_DOWNLOADS);
- websitePrefs.add(Type.BACKGROUND_SYNC);
CommandLine commandLine = CommandLine.getInstance();
- if (commandLine.hasSwitch(ContentSwitches.ENABLE_WEB_BLUETOOTH_SCANNING)) {
+ if (commandLine.hasSwitch(ContentSwitches.ENABLE_EXPERIMENTAL_WEB_PLATFORM_FEATURES)) {
websitePrefs.add(Type.BLUETOOTH_SCANNING);
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.gcm.patch b/build/patches/Remove-dependency-on-com.google.android.gcm.patch
index 309aee36..0d511eb3 100644
--- a/build/patches/Remove-dependency-on-com.google.android.gcm.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.gcm.patch
@@ -3,10 +3,10 @@ Date: Sat, 2 Nov 2019 09:29:52 +0100
Subject: Remove dependency on com.google.android.gcm
---
- third_party/android_sdk/BUILD.gn | 3 --
- .../external/client/android2/AndroidManifest.xml | 35 ----------------------
- .../channel/AndroidMessageReceiverService.java | 17 -----------
- .../channel/AndroidMessageSenderService.java | 3 +-
+ third_party/android_sdk/BUILD.gn | 3 --
+ .../client/android2/AndroidManifest.xml | 35 -------------------
+ .../AndroidMessageReceiverService.java | 17 ---------
+ .../channel/AndroidMessageSenderService.java | 3 +-
4 files changed, 1 insertion(+), 57 deletions(-)
diff --git a/third_party/android_sdk/BUILD.gn b/third_party/android_sdk/BUILD.gn
@@ -128,5 +128,5 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
// GCMRegistrar#getRegistrationId occasionally throws a runtime exception. Catching the
// exception rather than crashing.
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch b/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch
index 19d68233..57cad59c 100644
--- a/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch
@@ -3,20 +3,20 @@ Date: Sat, 2 Nov 2019 09:22:31 +0100
Subject: Remove dependency on com.google.android.gms.auth
---
- chrome/android/BUILD.gn | 1 -
- components/signin/core/browser/android/BUILD.gn | 1 -
- .../components/signin/AccountIdProvider.java | 10 +----
- .../signin/SystemAccountManagerDelegate.java | 15 +-------
- content/public/android/BUILD.gn | 1 -
- content/test/BUILD.gn | 1 -
- third_party/android_deps/BUILD.gn | 44 ----------------------
- third_party/robolectric/BUILD.gn | 1 -
+ chrome/android/BUILD.gn | 1 -
+ .../signin/core/browser/android/BUILD.gn | 1 -
+ .../components/signin/AccountIdProvider.java | 10 +----
+ .../signin/SystemAccountManagerDelegate.java | 15 +------
+ content/public/android/BUILD.gn | 1 -
+ content/test/BUILD.gn | 1 -
+ third_party/android_deps/BUILD.gn | 44 -------------------
+ third_party/robolectric/BUILD.gn | 1 -
8 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -267,7 +267,6 @@ android_library("chrome_java") {
+@@ -258,7 +258,6 @@ android_library("chrome_java") {
":thumbnail_cache_entry_proto_java",
":update_proto_java",
":usage_stats_proto_java",
@@ -27,7 +27,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn
--- a/components/signin/core/browser/android/BUILD.gn
+++ b/components/signin/core/browser/android/BUILD.gn
-@@ -15,7 +15,6 @@ generate_jni("jni_headers") {
+@@ -16,7 +16,6 @@ generate_jni("jni_headers") {
android_library("java") {
deps = [
@@ -108,7 +108,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
-@@ -2442,7 +2442,6 @@ if (is_android) {
+@@ -2444,7 +2444,6 @@ if (is_android) {
testonly = true
java_files = content_java_sources_needing_jni
deps = [
@@ -119,10 +119,11 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
-@@ -772,50 +772,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
+@@ -802,50 +802,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
+ ]
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_auth_java") {
- aar_path = "libs/com_google_android_gms_play_services_auth/play-services-auth-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_auth/com_google_android_gms_play_services_auth.info"
@@ -166,10 +167,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_base_java") {
aar_path = "libs/com_google_android_gms_play_services_base/play-services-base-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info"
diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
--- a/third_party/robolectric/BUILD.gn
+++ b/third_party/robolectric/BUILD.gn
@@ -182,5 +182,5 @@ diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
"$google_play_services_package:google_play_services_basement_java",
"//third_party/android_deps:android_support_v4_java",
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch b/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch
index 8f39984b..9e74d0e6 100644
--- a/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch
@@ -3,33 +3,33 @@ Date: Sat, 2 Nov 2019 08:00:04 +0100
Subject: Remove dependency on com.google.android.gms.cast
---
- chrome/android/BUILD.gn | 6 --
- chrome/android/features/media_router/BUILD.gn | 2 -
- .../browser/media/router/CastSessionUtil.java | 35 -------
- .../chrome/browser/media/router/MediaSink.java | 44 +-------
- .../browser/media/router/MediaStatusBridge.java | 40 ++-----
- .../router/caf/BaseNotificationController.java | 46 ---------
- .../media/router/caf/BaseSessionController.java | 115 +--------------------
- .../router/caf/CafBaseMediaRouteProvider.java | 103 +-----------------
- .../media/router/caf/CafMediaRouteProvider.java | 16 ---
- .../media/router/caf/CafMessageHandler.java | 97 +----------------
- .../browser/media/router/caf/CastMediaSource.java | 10 +-
- .../media/router/caf/CastOptionsProvider.java | 22 +---
- .../media/router/caf/CastSessionController.java | 84 ---------------
- .../chrome/browser/media/router/caf/CastUtils.java | 6 --
- .../remoting/CafExpandedControllerActivity.java | 24 +----
- .../caf/remoting/FlingingControllerAdapter.java | 61 -----------
- .../router/caf/remoting/RemotingMediaSource.java | 8 +-
- .../caf/remoting/RemotingSessionController.java | 21 ----
- chrome/android/java/AndroidManifest.xml | 28 -----
- chrome/test/android/cast_emulator/BUILD.gn | 1 -
- third_party/android_deps/BUILD.gn | 32 ------
- 21 files changed, 26 insertions(+), 775 deletions(-)
+ chrome/android/BUILD.gn | 6 -
+ chrome/android/features/media_router/BUILD.gn | 2 -
+ .../browser/media/router/CastSessionUtil.java | 35 ------
+ .../browser/media/router/MediaSink.java | 44 +------
+ .../media/router/MediaStatusBridge.java | 40 ++----
+ .../caf/BaseNotificationController.java | 46 -------
+ .../router/caf/BaseSessionController.java | 118 +-----------------
+ .../router/caf/CafBaseMediaRouteProvider.java | 103 +--------------
+ .../router/caf/CafMediaRouteProvider.java | 16 ---
+ .../media/router/caf/CafMessageHandler.java | 97 +-------------
+ .../media/router/caf/CastMediaSource.java | 10 +-
+ .../media/router/caf/CastOptionsProvider.java | 22 +---
+ .../router/caf/CastSessionController.java | 84 -------------
+ .../browser/media/router/caf/CastUtils.java | 6 -
+ .../CafExpandedControllerActivity.java | 24 +---
+ .../remoting/FlingingControllerAdapter.java | 61 ---------
+ .../caf/remoting/RemotingMediaSource.java | 8 +-
+ .../remoting/RemotingSessionController.java | 21 ----
+ chrome/android/java/AndroidManifest.xml | 28 -----
+ chrome/test/android/cast_emulator/BUILD.gn | 1 -
+ third_party/android_deps/BUILD.gn | 33 -----
+ 21 files changed, 27 insertions(+), 778 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -269,8 +269,6 @@ android_library("chrome_java") {
+@@ -260,8 +260,6 @@ android_library("chrome_java") {
":usage_stats_proto_java",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java",
@@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:jni_java",
-@@ -689,8 +687,6 @@ junit_binary("chrome_junit_tests") {
+@@ -654,8 +652,6 @@ junit_binary("chrome_junit_tests") {
":partner_location_descriptor_proto_java",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java",
@@ -47,7 +47,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
-@@ -790,8 +786,6 @@ android_library("chrome_test_java") {
+@@ -759,8 +755,6 @@ android_library("chrome_test_java") {
":partner_location_descriptor_proto_java",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java",
@@ -121,9 +121,9 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/MediaSink.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/MediaSink.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/MediaSink.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/MediaSink.java
-@@ -8,41 +8,24 @@ import android.support.annotation.Nullable;
- import android.support.v7.media.MediaRouter;
- import android.support.v7.media.MediaRouter.RouteInfo;
+@@ -9,41 +9,24 @@ import android.support.v7.media.MediaRouter.RouteInfo;
+
+ import androidx.annotation.Nullable;
-import com.google.android.gms.cast.CastDevice;
-
@@ -165,7 +165,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
}
/**
-@@ -52,17 +35,8 @@ public class MediaSink {
+@@ -53,17 +36,8 @@ public class MediaSink {
return CAST_SINK_URN_PREFIX + getId();
}
@@ -183,7 +183,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
return false;
}
-@@ -70,23 +44,15 @@ public class MediaSink {
+@@ -71,23 +45,15 @@ public class MediaSink {
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -208,7 +208,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
}
/**
-@@ -97,10 +63,6 @@ public class MediaSink {
+@@ -98,10 +64,6 @@ public class MediaSink {
*/
@Nullable
public static MediaSink fromSinkId(String sinkId, MediaRouter router) {
@@ -437,9 +437,9 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/BaseSessionController.java
-@@ -6,12 +6,6 @@ package org.chromium.chrome.browser.media.router.caf;
+@@ -6,18 +6,11 @@ package org.chromium.chrome.browser.media.router.caf;
- import android.support.annotation.Nullable;
+ import androidx.annotation.Nullable;
-import com.google.android.gms.cast.CastDevice;
-import com.google.android.gms.cast.framework.CastSession;
@@ -450,7 +450,13 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-@@ -52,16 +46,13 @@ public abstract class BaseSessionController {
+
+ import org.chromium.base.Log;
+-import org.chromium.chrome.browser.media.router.CastSessionUtil;
+ import org.chromium.chrome.browser.media.router.FlingingController;
+ import org.chromium.chrome.browser.media.router.MediaSink;
+ import org.chromium.chrome.browser.media.router.MediaSource;
+@@ -50,17 +43,14 @@ public abstract class BaseSessionController {
}
private final Random mRequestIdGenerator = new Random();
@@ -459,15 +465,17 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
private final CafBaseMediaRouteProvider mProvider;
private CreateRouteRequestInfo mRouteCreationInfo;
- private final RemoteMediaClient.Callback mRemoteMediaClientCallback;
- private final List> mCallbacks = new ArrayList<>();
+ private final List mCallbacks = new ArrayList<>();
public BaseSessionController(CafBaseMediaRouteProvider provider) {
mProvider = provider;
- mRemoteMediaClientCallback = new RemoteMediaClientCallback();
- }
+- }
++ }
public void addCallback(Callback callback) {
-@@ -80,9 +71,6 @@ public abstract class BaseSessionController {
+ mCallbacks.add(callback);
+@@ -72,9 +62,6 @@ public abstract class BaseSessionController {
public void requestSessionLaunch() {
mRouteCreationInfo = mProvider.getPendingCreateRouteRequestInfo();
@@ -477,7 +485,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
// When the user clicks a route on the MediaRouteChooserDialog, we intercept the click event
// and do not select the route. Instead the route selection is postponed to here. This will
// trigger CAF to launch the session.
-@@ -101,60 +89,18 @@ public abstract class BaseSessionController {
+@@ -93,60 +80,18 @@ public abstract class BaseSessionController {
return mRouteCreationInfo;
}
@@ -539,7 +547,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
}
private void updateMediaSessionId(String message) {
-@@ -179,29 +125,6 @@ public abstract class BaseSessionController {
+@@ -171,29 +116,6 @@ public abstract class BaseSessionController {
private void updateRemoteMediaClient(String message) {
if (!isConnected()) return;
@@ -569,7 +577,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
}
/** Called when session started. */
-@@ -218,40 +141,6 @@ public abstract class BaseSessionController {
+@@ -210,40 +132,6 @@ public abstract class BaseSessionController {
return mProvider;
}
@@ -610,7 +618,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
@Nullable
public FlingingController getFlingingController() {
return null;
-@@ -262,7 +151,7 @@ public abstract class BaseSessionController {
+@@ -254,7 +142,7 @@ public abstract class BaseSessionController {
* {@link CastSession#getSessionId()} is final.
*/
public String getSessionId() {
@@ -622,9 +630,9 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafBaseMediaRouteProvider.java
-@@ -11,9 +11,6 @@ import android.support.v7.media.MediaRouteSelector;
- import android.support.v7.media.MediaRouter;
- import android.support.v7.media.MediaRouter.RouteInfo;
+@@ -12,9 +12,6 @@ import androidx.annotation.NonNull;
+ import androidx.annotation.Nullable;
+ import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.cast.framework.CastSession;
-import com.google.android.gms.cast.framework.SessionManagerListener;
@@ -632,7 +640,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
import org.chromium.base.Log;
import org.chromium.chrome.browser.media.router.DiscoveryCallback;
import org.chromium.chrome.browser.media.router.DiscoveryDelegate;
-@@ -36,7 +33,7 @@ import java.util.Set;
+@@ -37,7 +34,7 @@ import java.util.Set;
* A base provider containing common implementation for CAF-based {@link MediaRouteProvider}s.
*/
public abstract class CafBaseMediaRouteProvider
@@ -641,7 +649,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
private static final String TAG = "CafMR";
protected static final List NO_SINKS = Collections.emptyList();
-@@ -153,7 +150,6 @@ public abstract class CafBaseMediaRouteProvider
+@@ -154,7 +151,6 @@ public abstract class CafBaseMediaRouteProvider
// current session and clean up the routes (can't wait for session ending as the signal
// might be delayed).
sessionController().endSession();
@@ -649,7 +657,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
}
if (mPendingCreateRouteRequestInfo != null) {
cancelPendingRequest("Request replaced");
-@@ -182,9 +178,6 @@ public abstract class CafBaseMediaRouteProvider
+@@ -183,9 +179,6 @@ public abstract class CafBaseMediaRouteProvider
mManager.onRouteRequestError("The sink does not exist", nativeRequestId);
}
@@ -659,7 +667,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
mPendingCreateRouteRequestInfo = new CreateRouteRequestInfo(source, sink, presentationId,
origin, tabId, isIncognito, nativeRequestId, targetRouteInfo);
-@@ -211,100 +204,6 @@ public abstract class CafBaseMediaRouteProvider
+@@ -212,100 +205,6 @@ public abstract class CafBaseMediaRouteProvider
removeRoute(routeId, /* error= */ null);
}
@@ -763,9 +771,9 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMediaRouteProvider.java
-@@ -11,8 +11,6 @@ import android.support.annotation.Nullable;
- import android.support.annotation.VisibleForTesting;
- import android.support.v7.media.MediaRouter;
+@@ -12,8 +12,6 @@ import androidx.annotation.NonNull;
+ import androidx.annotation.Nullable;
+ import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.cast.framework.CastSession;
-
@@ -773,9 +781,10 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
import org.chromium.chrome.browser.media.router.ChromeMediaRouter;
import org.chromium.chrome.browser.media.router.ClientRecord;
@@ -148,20 +146,6 @@ public class CafMediaRouteProvider extends CafBaseMediaRouteProvider {
+ return mMessageHandler;
}
- @Override
+- @Override
- protected void handleSessionStart(CastSession session, String sessionId) {
- super.handleSessionStart(session, sessionId);
-
@@ -789,10 +798,9 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
- sessionController().getSession().getRemoteMediaClient().requestStatus();
- }
-
-- @Override
+ @Override
protected void addRoute(
MediaRoute route, String origin, int tabId, int nativeRequestId, boolean wasLaunched) {
- super.addRoute(route, origin, tabId, nativeRequestId, wasLaunched);
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java
@@ -941,16 +949,16 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CastMediaSource.java
-@@ -8,8 +8,6 @@ import android.net.Uri;
- import android.support.annotation.Nullable;
- import android.support.v7.media.MediaRouteSelector;
+@@ -9,8 +9,6 @@ import android.support.v7.media.MediaRouteSelector;
+
+ import androidx.annotation.Nullable;
-import com.google.android.gms.cast.CastMediaControlIntent;
-
import org.chromium.chrome.browser.media.router.MediaSource;
import java.util.Arrays;
-@@ -105,13 +103,7 @@ public class CastMediaSource implements MediaSource {
+@@ -106,13 +104,7 @@ public class CastMediaSource implements MediaSource {
*/
@Override
public MediaRouteSelector buildRouteSelector() {
@@ -1002,8 +1010,8 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CastSessionController.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CastSessionController.java
@@ -7,11 +7,6 @@ package org.chromium.chrome.browser.media.router.caf;
- import android.support.annotation.NonNull;
- import android.support.annotation.VisibleForTesting;
+ import androidx.annotation.NonNull;
+ import androidx.annotation.VisibleForTesting;
-import com.google.android.gms.cast.ApplicationMetadata;
-import com.google.android.gms.cast.Cast;
@@ -1204,7 +1212,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
return flags;
}
};
-@@ -173,20 +161,10 @@ public class CafExpandedControllerActivity
+@@ -179,20 +167,10 @@ public class CafExpandedControllerActivity
private void updateUi() {
if (!mSessionController.isConnected()) return;
@@ -1339,16 +1347,16 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingMediaSource.java
-@@ -11,8 +11,6 @@ import android.support.annotation.Nullable;
- import android.support.v7.media.MediaRouteSelector;
- import android.util.Base64;
+@@ -12,8 +12,6 @@ import android.util.Base64;
+
+ import androidx.annotation.Nullable;
-import com.google.android.gms.cast.CastMediaControlIntent;
-
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.chrome.browser.media.router.MediaSource;
-@@ -78,9 +76,7 @@ public class RemotingMediaSource implements MediaSource {
+@@ -79,9 +77,7 @@ public class RemotingMediaSource implements MediaSource {
*/
@Override
public MediaRouteSelector buildRouteSelector() {
@@ -1359,7 +1367,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
}
/**
-@@ -107,7 +103,7 @@ public class RemotingMediaSource implements MediaSource {
+@@ -108,7 +104,7 @@ public class RemotingMediaSource implements MediaSource {
sApplicationId = (customAppId != null && !customAppId.isEmpty())
? customAppId
@@ -1380,10 +1388,11 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
import org.chromium.base.Log;
import org.chromium.chrome.browser.media.router.CastSessionUtil;
import org.chromium.chrome.browser.media.router.caf.BaseNotificationController;
-@@ -34,19 +32,6 @@ public class RemotingSessionController extends BaseSessionController {
+@@ -33,19 +31,6 @@ public class RemotingSessionController extends BaseSessionController {
+ sInstance = new WeakReference<>(this);
}
- @Override
+- @Override
- public void attachToCastSession(CastSession session) {
- super.attachToCastSession(session);
-
@@ -1396,27 +1405,26 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
- }
- }
-
-- @Override
+ @Override
public void onSessionStarted() {
super.onSessionStarted();
- RemotingMediaSource source = (RemotingMediaSource) getSource();
-@@ -54,12 +39,6 @@ public class RemotingSessionController extends BaseSessionController {
+@@ -53,12 +38,6 @@ public class RemotingSessionController extends BaseSessionController {
+ mFlingingControllerAdapter = new FlingingControllerAdapter(this, source.getMediaUrl());
}
- @Override
+- @Override
- protected void onStatusUpdated() {
- mFlingingControllerAdapter.onStatusUpdated();
- super.onStatusUpdated();
- }
-
-- @Override
+ @Override
public FlingingControllerAdapter getFlingingController() {
return mFlingingControllerAdapter;
- }
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
-@@ -184,12 +184,6 @@ by a child template that "extends" this file.
+@@ -180,12 +180,6 @@ by a child template that "extends" this file.
android:theme="@android:style/Theme.Material.Light.Dialog.Alert" />
{% endif %}
@@ -1429,7 +1437,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
+@@ -1195,18 +1179,6 @@ android:value="true" />
{% endif %}
{% block extra_application_definitions %}
@@ -1479,10 +1487,11 @@ diff --git a/chrome/test/android/cast_emulator/BUILD.gn b/chrome/test/android/ca
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
-@@ -798,38 +798,6 @@ android_aar_prebuilt("google_play_services_basement_java") {
+@@ -828,39 +828,6 @@ android_aar_prebuilt("google_play_services_basement_java") {
+ input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_cast_java") {
- aar_path = "libs/com_google_android_gms_play_services_cast/play-services-cast-16.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_cast/com_google_android_gms_play_services_cast.info"
@@ -1511,13 +1520,13 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- ]
-
- # Removing all resources from cast framework as they are unused bloat.
-- strip_resources = true
+- # Can only safely remove them when R8 will strip the path that accesses them.
+- strip_resources = !is_java_debug
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_tasks_java") {
aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch b/build/patches/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
index bffdc258..a4f1520d 100644
--- a/build/patches/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
@@ -5,39 +5,39 @@ Subject: Remove dependency on
com.google.android.gms.tasks
---
- chrome/android/BUILD.gn | 8 ---
- chrome/android/features/media_router/BUILD.gn | 2 -
- .../browser/media/router/ChromeMediaRouter.java | 7 +-
- chrome/android/java/AndroidManifest.xml | 9 ---
- .../src/org/chromium/chrome/browser/AppHooks.java | 14 +---
- .../chromium/chrome/browser/ChromeVersionInfo.java | 12 +---
- .../browser/component_updater/UpdateScheduler.java | 3 -
- .../browser/externalauth/ExternalAuthUtils.java | 14 ++--
- .../externalauth/UserRecoverableErrorHandler.java | 7 --
- .../browser/gcore/ChromeGoogleApiClientImpl.java | 25 +------
- .../browser/gcore/GoogleApiClientHelper.java | 82 +---------------------
- .../chrome/browser/omaha/UpdateStatusProvider.java | 10 +--
- .../browser/preferences/PreferencesLauncher.java | 5 +-
- chrome/test/android/BUILD.gn | 2 -
- components/background_task_scheduler/BUILD.gn | 10 ---
- components/signin/core/browser/android/BUILD.gn | 2 -
- .../signin/GmsAvailabilityException.java | 4 +-
- content/public/android/BUILD.gn | 3 -
- content/test/BUILD.gn | 3 -
- device/BUILD.gn | 2 -
- remoting/android/client_java_tmpl.gni | 3 -
- services/BUILD.gn | 4 --
- services/device/geolocation/BUILD.gn | 2 -
- services/shape_detection/BUILD.gn | 2 -
- third_party/android_deps/BUILD.gn | 38 ----------
- third_party/cacheinvalidation/BUILD.gn | 1 -
- third_party/robolectric/BUILD.gn | 2 -
- 27 files changed, 16 insertions(+), 260 deletions(-)
+ chrome/android/BUILD.gn | 8 --
+ chrome/android/features/media_router/BUILD.gn | 2 -
+ .../media/router/ChromeMediaRouter.java | 7 +-
+ chrome/android/java/AndroidManifest.xml | 9 --
+ .../org/chromium/chrome/browser/AppHooks.java | 14 +---
+ .../chrome/browser/ChromeVersionInfo.java | 12 +--
+ .../component_updater/UpdateScheduler.java | 3 -
+ .../externalauth/ExternalAuthUtils.java | 14 +---
+ .../UserRecoverableErrorHandler.java | 7 --
+ .../gcore/ChromeGoogleApiClientImpl.java | 25 +-----
+ .../browser/gcore/GoogleApiClientHelper.java | 82 +------------------
+ .../browser/omaha/UpdateStatusProvider.java | 10 +--
+ .../preferences/PreferencesLauncher.java | 20 +----
+ chrome/test/android/BUILD.gn | 2 -
+ components/background_task_scheduler/BUILD.gn | 10 ---
+ .../signin/core/browser/android/BUILD.gn | 2 -
+ .../signin/GmsAvailabilityException.java | 4 +-
+ content/public/android/BUILD.gn | 3 -
+ content/test/BUILD.gn | 3 -
+ device/BUILD.gn | 2 -
+ remoting/android/client_java_tmpl.gni | 3 -
+ services/BUILD.gn | 4 -
+ services/device/geolocation/BUILD.gn | 2 -
+ services/shape_detection/BUILD.gn | 2 -
+ third_party/android_deps/BUILD.gn | 38 ---------
+ third_party/cacheinvalidation/BUILD.gn | 1 -
+ third_party/robolectric/BUILD.gn | 2 -
+ 27 files changed, 16 insertions(+), 275 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -267,9 +267,6 @@ android_library("chrome_java") {
+@@ -258,9 +258,6 @@ android_library("chrome_java") {
":thumbnail_cache_entry_proto_java",
":update_proto_java",
":usage_stats_proto_java",
@@ -47,7 +47,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:jni_java",
"//chrome/android/features/keyboard_accessory:public_java",
-@@ -685,8 +682,6 @@ junit_binary("chrome_junit_tests") {
+@@ -650,8 +647,6 @@ junit_binary("chrome_junit_tests") {
":chrome_java",
":chrome_junit_test_support",
":partner_location_descriptor_proto_java",
@@ -56,8 +56,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
-@@ -784,9 +779,6 @@ android_library("chrome_test_java") {
- ":browser_java_test_support",
+@@ -753,9 +748,6 @@ android_library("chrome_test_java") {
+ ":chrome_public_test_apk_resources",
":chrome_test_util_java",
":partner_location_descriptor_proto_java",
- "$google_play_services_package:google_play_services_base_java",
@@ -81,9 +81,9 @@ diff --git a/chrome/android/features/media_router/BUILD.gn b/chrome/android/feat
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
-@@ -7,9 +7,6 @@ package org.chromium.chrome.browser.media.router;
- import android.support.annotation.Nullable;
- import android.support.v7.media.MediaRouter;
+@@ -8,9 +8,6 @@ import android.support.v7.media.MediaRouter;
+
+ import androidx.annotation.Nullable;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
@@ -91,7 +91,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.StrictModeContext;
-@@ -43,9 +40,7 @@ public class ChromeMediaRouter implements MediaRouteManager {
+@@ -44,9 +41,7 @@ public class ChromeMediaRouter implements MediaRouteManager {
int googleApiAvailabilityResult =
AppHooks.get().isGoogleApiAvailableWithMinApkVersion(
MIN_GOOGLE_PLAY_SERVICES_APK_VERSION);
@@ -105,7 +105,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
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
-@@ -889,15 +889,6 @@ by a child template that "extends" this file.
+@@ -840,15 +840,6 @@ by a child template that "extends" this file.
@@ -124,17 +124,17 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
-@@ -15,9 +15,6 @@ import android.support.annotation.Nullable;
- import android.view.View;
- import android.view.inputmethod.InputConnection;
+@@ -13,9 +13,6 @@ import android.view.View;
+
+ import androidx.annotation.Nullable;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-
import org.chromium.base.Callback;
- import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils;
-@@ -419,16 +416,7 @@ public abstract class AppHooks {
+ import org.chromium.base.VisibleForTesting;
+@@ -380,16 +377,7 @@ public abstract class AppHooks {
* same as {@link GoogleApiAvailability#isGooglePlayServicesAvailable()}.
*/
public int isGoogleApiAvailableWithMinApkVersion(int minApkVersion) {
@@ -203,9 +203,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updat
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
-@@ -13,9 +13,6 @@ import android.os.Binder;
- import android.support.annotation.WorkerThread;
- import android.text.TextUtils;
+@@ -14,9 +14,6 @@ import android.text.TextUtils;
+
+ import androidx.annotation.WorkerThread;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
@@ -213,7 +213,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex
import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
-@@ -157,9 +154,7 @@ public class ExternalAuthUtils {
+@@ -158,9 +155,7 @@ public class ExternalAuthUtils {
* when it is updating.
*/
public boolean isGooglePlayServicesMissing(final Context context) {
@@ -224,7 +224,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex
}
/**
-@@ -181,7 +176,6 @@ public class ExternalAuthUtils {
+@@ -182,7 +177,6 @@ public class ExternalAuthUtils {
Context context = ContextUtils.getApplicationContext();
final int resultCode = checkGooglePlayServicesAvailable(context);
@@ -232,7 +232,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex
// resultCode is some kind of error.
Log.v(TAG, "Unable to use Google Play Services: %s", describeError(resultCode));
if (isUserRecoverableError(resultCode)) {
-@@ -251,7 +245,7 @@ public class ExternalAuthUtils {
+@@ -252,7 +246,7 @@ public class ExternalAuthUtils {
protected int checkGooglePlayServicesAvailable(final Context context) {
// TODO(crbug.com/577190): Temporarily allowing disk access until more permanent fix is in.
try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
@@ -241,7 +241,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex
}
}
-@@ -263,7 +257,7 @@ public class ExternalAuthUtils {
+@@ -264,7 +258,7 @@ public class ExternalAuthUtils {
* @return true If the code represents a user-recoverable error
*/
protected boolean isUserRecoverableError(final int errorCode) {
@@ -250,7 +250,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex
}
/**
-@@ -273,6 +267,6 @@ public class ExternalAuthUtils {
+@@ -274,6 +268,6 @@ public class ExternalAuthUtils {
* @return a textual description of the error code
*/
protected String describeError(final int errorCode) {
@@ -373,7 +373,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi
import org.chromium.base.ApplicationStatus;
import org.chromium.base.ApplicationStatus.ApplicationStateListener;
import org.chromium.base.Log;
-@@ -67,30 +62,16 @@ import org.chromium.base.ThreadUtils;
+@@ -67,29 +62,15 @@ import org.chromium.base.ThreadUtils;
* }
*
*/
@@ -389,7 +389,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi
private long mDisconnectionDelayMs;
private Runnable mPendingDisconnect;
- /**
+- /**
- * Creates a helper and enrolls it in the various connection management features.
- * See the class documentation for {@link GoogleApiClientHelper} for more information.
- *
@@ -401,10 +401,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi
- enableLifecycleManagement(true);
- }
-
-- /**
+ /**
* Opts in or out of lifecycle management. The client's connection will be closed and reopened
* when Chrome goes in and out of background.
- *
@@ -116,13 +97,6 @@ public class GoogleApiClientHelper
* Enabling or disabling it while it is already enabled or disabled has no effect.
*/
@@ -502,16 +501,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
-@@ -19,8 +19,6 @@ import android.support.annotation.NonNull;
- import android.support.annotation.Nullable;
- import android.text.TextUtils;
+@@ -20,8 +20,6 @@ import androidx.annotation.IntDef;
+ import androidx.annotation.NonNull;
+ import androidx.annotation.Nullable;
-import com.google.android.gms.common.GooglePlayServicesUtil;
-
import org.chromium.base.ActivityState;
import org.chromium.base.ApplicationStatus;
import org.chromium.base.ApplicationStatus.ActivityStateListener;
-@@ -463,13 +461,7 @@ public class UpdateStatusProvider implements ActivityStateListener {
+@@ -464,13 +462,7 @@ public class UpdateStatusProvider implements ActivityStateListener {
}
private boolean isGooglePlayStoreAvailable(Context context) {
@@ -529,30 +528,44 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java
-@@ -12,8 +12,6 @@ import android.os.Bundle;
- import android.support.annotation.Nullable;
- import android.support.v4.app.Fragment;
+@@ -13,8 +13,6 @@ import android.support.v4.app.Fragment;
+
+ import androidx.annotation.Nullable;
-import com.google.android.gms.common.ConnectionResult;
-
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.metrics.RecordUserAction;
-@@ -202,8 +200,7 @@ public class PreferencesLauncher {
- int minGooglePlayServicesVersion = ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
- GOOGLE_ACCOUNT_PWM_UI, MIN_GOOGLE_PLAY_SERVICES_VERSION_PARAM,
- DEFAULT_MIN_GOOGLE_PLAY_SERVICES_APK_VERSION);
-- if (AppHooks.get().isGoogleApiAvailableWithMinApkVersion(minGooglePlayServicesVersion)
-- != ConnectionResult.SUCCESS)
-+ if (true)
- return false;
+@@ -190,22 +188,6 @@ public class PreferencesLauncher {
+ }
- if (!ChromeFeatureList.isEnabled(GOOGLE_ACCOUNT_PWM_UI)) return false;
+ private static boolean tryShowingTheGooglePasswordManager(Activity activity) {
+- GooglePasswordManagerUIProvider googlePasswordManagerUIProvider =
+- AppHooks.get().createGooglePasswordManagerUIProvider();
+- if (googlePasswordManagerUIProvider == null) return false;
+-
+- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return false;
+-
+- int minGooglePlayServicesVersion = ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
+- GOOGLE_ACCOUNT_PWM_UI, MIN_GOOGLE_PLAY_SERVICES_VERSION_PARAM,
+- DEFAULT_MIN_GOOGLE_PLAY_SERVICES_APK_VERSION);
+- if (AppHooks.get().isGoogleApiAvailableWithMinApkVersion(minGooglePlayServicesVersion)
+- != ConnectionResult.SUCCESS) {
+- return false;
+- }
+-
+- if (!ChromeFeatureList.isEnabled(GOOGLE_ACCOUNT_PWM_UI)) return false;
+-
+- return googlePasswordManagerUIProvider.showGooglePasswordManager(activity);
++ return false;
+ }
+ }
diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
--- a/chrome/test/android/BUILD.gn
+++ b/chrome/test/android/BUILD.gn
-@@ -153,8 +153,6 @@ android_library("chrome_java_test_support") {
- "javatests/src/org/chromium/chrome/test/util/TranslateUtil.java",
+@@ -175,8 +175,6 @@ android_library("chrome_java_test_support") {
+ "javatests/src/org/chromium/chrome/test/util/WaitForFocusHelper.java",
]
deps = [
- "$google_play_services_package:google_play_services_base_java",
@@ -572,7 +585,7 @@ diff --git a/components/background_task_scheduler/BUILD.gn b/components/backgrou
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//content/public/android:content_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/android_deps:androidx_annotation_annotation_java",
@@ -75,9 +72,6 @@ if (is_android) {
deps = [
":background_task_scheduler_java",
@@ -597,7 +610,7 @@ diff --git a/components/background_task_scheduler/BUILD.gn b/components/backgrou
diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn
--- a/components/signin/core/browser/android/BUILD.gn
+++ b/components/signin/core/browser/android/BUILD.gn
-@@ -15,8 +15,6 @@ generate_jni("jni_headers") {
+@@ -16,8 +16,6 @@ generate_jni("jni_headers") {
android_library("java") {
deps = [
@@ -642,7 +655,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
-@@ -2442,9 +2442,6 @@ if (is_android) {
+@@ -2444,9 +2444,6 @@ if (is_android) {
testonly = true
java_files = content_java_sources_needing_jni
deps = [
@@ -651,11 +664,11 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//content/public/android:content_java",
- ]
+ "//ui/android:ui_full_java",
diff --git a/device/BUILD.gn b/device/BUILD.gn
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
-@@ -386,8 +386,6 @@ if (is_android) {
+@@ -387,8 +387,6 @@ if (is_android) {
junit_binary("device_junit_tests") {
java_files = [ "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java" ]
deps = [
@@ -667,7 +680,7 @@ diff --git a/device/BUILD.gn b/device/BUILD.gn
diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
--- a/remoting/android/client_java_tmpl.gni
+++ b/remoting/android/client_java_tmpl.gni
-@@ -101,9 +101,6 @@ template("remoting_android_client_java_tmpl") {
+@@ -102,9 +102,6 @@ template("remoting_android_client_java_tmpl") {
if (defined(invoker.play_services_package)) {
deps += [
@@ -701,15 +714,15 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
--- a/services/device/geolocation/BUILD.gn
+++ b/services/device/geolocation/BUILD.gn
-@@ -141,8 +141,6 @@ if (is_android) {
+@@ -150,8 +150,6 @@ if (is_android) {
deps = [
":geolocation",
":geolocation_jni_headers",
- "$google_play_services_package:google_play_services_base_java",
- "$google_play_services_package:google_play_services_basement_java",
"//base:base_java",
+ "//base:jni_java",
"//components/location/android:location_java",
- "//services/device/public/java:geolocation_java",
diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
--- a/services/shape_detection/BUILD.gn
+++ b/services/shape_detection/BUILD.gn
@@ -725,10 +738,11 @@ diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
-@@ -772,44 +772,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
+@@ -802,44 +802,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
+ ]
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_base_java") {
- aar_path = "libs/com_google_android_gms_play_services_base/play-services-base-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info"
@@ -766,10 +780,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_google_android_material_material_java") {
aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
- info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
--- a/third_party/cacheinvalidation/BUILD.gn
+++ b/third_party/cacheinvalidation/BUILD.gn
@@ -794,5 +807,5 @@ diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
"//third_party/gson:gson_java",
"//third_party/guava:guava_java",
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch b/build/patches/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
index 0574cfca..c4d992eb 100644
--- a/build/patches/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
@@ -5,23 +5,23 @@ Subject: Remove dependency on com.google.android.gms.fido,
com.google.android.gms.location
---
- chrome/android/BUILD.gn | 5 -
- .../externalnav/ExternalNavigationHandler.java | 3 -
- .../browser/instantapps/InstantAppsHandler.java | 59 +-----------
- components/gcm_driver/instance_id/android/BUILD.gn | 2 -
- .../instance_id/InstanceIDWithSubtype.java | 28 +-----
- device/BUILD.gn | 1 -
- services/device/geolocation/BUILD.gn | 1 -
- .../geolocation/LocationProviderGmsCore.java | 103 +--------------------
- third_party/android_deps/BUILD.gn | 58 ------------
- third_party/cacheinvalidation/BUILD.gn | 1 -
- .../client/android2/AndroidManifestUpdatedGcm.xml | 3 -
- 11 files changed, 9 insertions(+), 255 deletions(-)
+ chrome/android/BUILD.gn | 5 -
+ .../ExternalNavigationHandler.java | 4 -
+ .../instantapps/InstantAppsHandler.java | 59 +---------
+ .../gcm_driver/instance_id/android/BUILD.gn | 2 -
+ .../instance_id/InstanceIDWithSubtype.java | 28 +----
+ device/BUILD.gn | 1 -
+ services/device/geolocation/BUILD.gn | 1 -
+ .../geolocation/LocationProviderGmsCore.java | 103 +-----------------
+ third_party/android_deps/BUILD.gn | 58 ----------
+ third_party/cacheinvalidation/BUILD.gn | 1 -
+ .../android2/AndroidManifestUpdatedGcm.xml | 3 -
+ 11 files changed, 9 insertions(+), 256 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -271,8 +271,6 @@ android_library("chrome_java") {
+@@ -262,8 +262,6 @@ android_library("chrome_java") {
"$google_play_services_package:google_play_services_basement_java",
"$google_play_services_package:google_play_services_cast_framework_java",
"$google_play_services_package:google_play_services_cast_java",
@@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:jni_java",
-@@ -693,7 +691,6 @@ junit_binary("chrome_junit_tests") {
+@@ -658,7 +656,6 @@ junit_binary("chrome_junit_tests") {
"$google_play_services_package:google_play_services_basement_java",
"$google_play_services_package:google_play_services_cast_framework_java",
"$google_play_services_package:google_play_services_cast_java",
@@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
-@@ -795,8 +792,6 @@ android_library("chrome_test_java") {
+@@ -764,8 +761,6 @@ android_library("chrome_test_java") {
"$google_play_services_package:google_play_services_basement_java",
"$google_play_services_package:google_play_services_cast_framework_java",
"$google_play_services_package:google_play_services_cast_java",
@@ -50,23 +50,17 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
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
-@@ -581,7 +581,6 @@ public class ExternalNavigationHandler {
+@@ -641,10 +641,6 @@ public class ExternalNavigationHandler {
if (shouldProxyForInstantApps) {
RecordHistogram.recordEnumeratedHistogram("Android.InstantApps.DirectInstantAppsIntent",
AiaIntent.SERP, AiaIntent.NUM_ENTRIES);
-- intent.putExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER, true);
- } else if (isDirectInstantAppsIntent) {
- // For security reasons, we disable all intent:// URLs to Instant Apps that are
- // not coming from SERP.
-@@ -590,8 +589,6 @@ public class ExternalNavigationHandler {
- AiaIntent.OTHER, AiaIntent.NUM_ENTRIES);
- return OverrideUrlLoadingResult.NO_OVERRIDE;
- } else {
+- targetIntent.putExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER, true);
+- } else {
- // Make sure this extra is not sent unless we've done the verification.
-- intent.removeExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER);
+- targetIntent.removeExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER);
}
- boolean deviceCanHandleIntent = deviceCanHandleIntent(intent);
+ // The intent can be used to launch Chrome itself, record the user
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
@@ -184,15 +178,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/Ins
diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
--- a/components/gcm_driver/instance_id/android/BUILD.gn
+++ b/components/gcm_driver/instance_id/android/BUILD.gn
-@@ -18,7 +18,6 @@ generate_jni("test_support_jni_headers") {
+@@ -19,7 +19,6 @@ generate_jni("test_support_jni_headers") {
android_library("instance_id_driver_java") {
deps = [
- "$google_play_services_package:google_play_services_iid_java",
"//base:base_java",
+ "//base:jni_java",
"//components/gcm_driver/android:gcm_driver_java",
- ]
-@@ -34,7 +33,6 @@ android_library("instance_id_driver_java") {
+@@ -37,7 +36,6 @@ android_library("instance_id_driver_java") {
android_library("instance_id_driver_test_support_java") {
deps = [
":instance_id_driver_java",
@@ -288,7 +282,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
diff --git a/device/BUILD.gn b/device/BUILD.gn
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
-@@ -388,7 +388,6 @@ if (is_android) {
+@@ -389,7 +389,6 @@ if (is_android) {
deps = [
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java",
@@ -299,14 +293,14 @@ diff --git a/device/BUILD.gn b/device/BUILD.gn
diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
--- a/services/device/geolocation/BUILD.gn
+++ b/services/device/geolocation/BUILD.gn
-@@ -143,7 +143,6 @@ if (is_android) {
+@@ -152,7 +152,6 @@ if (is_android) {
":geolocation_jni_headers",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java",
- "$google_play_services_package:google_play_services_location_java",
"//base:base_java",
+ "//base:jni_java",
"//components/location/android:location_java",
- "//services/device/public/java:geolocation_java",
diff --git a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java
--- a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java
+++ b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java
@@ -460,10 +454,11 @@ diff --git a/services/device/geolocation/android/java/src/org/chromium/device/ge
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
-@@ -830,64 +830,6 @@ android_aar_prebuilt("google_play_services_cast_framework_java") {
+@@ -861,64 +861,6 @@ android_aar_prebuilt("google_play_services_cast_framework_java") {
+ strip_resources = !is_java_debug
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_fido_java") {
- aar_path = "libs/com_google_android_gms_play_services_fido/play-services-fido-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_fido/com_google_android_gms_play_services_fido.info"
@@ -521,10 +516,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_tasks_java") {
aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
--- a/third_party/cacheinvalidation/BUILD.gn
+++ b/third_party/cacheinvalidation/BUILD.gn
@@ -550,5 +544,5 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch b/build/patches/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
index 1c641ea6..190604fc 100644
--- a/build/patches/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
@@ -4,16 +4,17 @@ Subject: Remove dependency on com.google.android.gms.flags,
com.google.android.gms.location.places, com.google.android.gms.stats
---
- third_party/android_deps/BUILD.gn | 49 ---------------------------------------
+ third_party/android_deps/BUILD.gn | 49 -------------------------------
1 file changed, 49 deletions(-)
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
-@@ -1499,55 +1499,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
+@@ -1512,55 +1512,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
+ ignore_aidl = true
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_flags_java") {
- aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
@@ -62,10 +63,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("com_google_code_findbugs_jsr305_java") {
jar_path = "libs/com_google_code_findbugs_jsr305/jsr305-1.3.9.jar"
- output_name = "com_google_code_findbugs_jsr305"
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch b/build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch
index d4ece443..74c7180c 100644
--- a/build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch
@@ -5,28 +5,26 @@ Subject: Remove dependency on com.google.android.gms.gcm
It also disalbes Snippets, auto-update of offline pages and launching browser from background service.
The snippets are already disabled in native codes, this will disable it on Java level.
---
- chrome/android/BUILD.gn | 3 -
- .../chrome/browser/BackgroundSyncLauncher.java | 17 +----
- .../chrome/browser/ChromeBackgroundService.java | 79 +------------------
- .../invalidation/InvalidationController.java | 1 +
- .../browser/ntp/snippets/SnippetsLauncher.java | 2 +-
- .../services/gcm/ChromeGcmListenerService.java | 58 +-------------
- components/background_task_scheduler/BUILD.gn | 3 -
- .../BackgroundTaskGcmTaskService.java | 63 +--------------
- .../BackgroundTaskSchedulerFactory.java | 6 +-
- .../BackgroundTaskSchedulerGcmNetworkManager.java | 14 +---
- third_party/android_deps/BUILD.gn | 15 ----
- third_party/cacheinvalidation/BUILD.gn | 1 -
- .../client/android2/AndroidManifestUpdatedGcm.xml | 20 -----
- .../android2/channel/AndroidGcmController.java | 42 +---------
- .../channel/AndroidInstanceIDListenerService.java | 13 +---
- .../channel/GcmRegistrationTaskService.java | 89 +---------------------
- 16 files changed, 14 insertions(+), 412 deletions(-)
+ chrome/android/BUILD.gn | 3 -
+ .../browser/ChromeBackgroundService.java | 4 -
+ .../ntp/snippets/SnippetsLauncher.java | 2 +-
+ .../gcm/ChromeGcmListenerService.java | 57 +-----------
+ components/background_task_scheduler/BUILD.gn | 3 -
+ .../BackgroundTaskGcmTaskService.java | 63 +------------
+ .../BackgroundTaskSchedulerFactory.java | 6 +-
+ ...kgroundTaskSchedulerGcmNetworkManager.java | 14 +--
+ third_party/android_deps/BUILD.gn | 15 ----
+ third_party/cacheinvalidation/BUILD.gn | 1 -
+ .../android2/AndroidManifestUpdatedGcm.xml | 20 -----
+ .../channel/AndroidGcmController.java | 42 +--------
+ .../AndroidInstanceIDListenerService.java | 13 +--
+ .../channel/GcmRegistrationTaskService.java | 89 +------------------
+ 14 files changed, 10 insertions(+), 322 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -272,7 +272,6 @@ android_library("chrome_java") {
+@@ -263,7 +263,6 @@ android_library("chrome_java") {
"$google_play_services_package:google_play_services_cast_framework_java",
"$google_play_services_package:google_play_services_cast_java",
"$google_play_services_package:google_play_services_fido_java",
@@ -34,7 +32,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"$google_play_services_package:google_play_services_iid_java",
"$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
-@@ -798,7 +797,6 @@ android_library("chrome_test_java") {
+@@ -767,7 +766,6 @@ android_library("chrome_test_java") {
"$google_play_services_package:google_play_services_cast_framework_java",
"$google_play_services_package:google_play_services_cast_java",
"$google_play_services_package:google_play_services_fido_java",
@@ -50,40 +48,6 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//chrome/android/public/profiles:java",
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
-@@ -41,7 +41,7 @@ public class BackgroundSyncLauncher {
- * Automatic GCM use is disabled by tests, and also by this class if it is determined on
- * creation that the installed Play Services library is out of date.
- */
-- private static boolean sGCMEnabled = true;
-+ private static boolean sGCMEnabled;
-
- @VisibleForTesting
- protected AsyncTask mLaunchBrowserIfStoppedTask;
-@@ -140,20 +140,7 @@ public class BackgroundSyncLauncher {
- */
- @CalledByNative
- private static boolean shouldDisableBackgroundSync() {
-- // Check to see if Play Services is up to date, and disable GCM if not.
-- // This will not automatically set {@link sGCMEnabled} to true, in case it has been
-- // disabled in tests.
-- if (sGCMEnabled) {
-- boolean isAvailable = true;
-- if (!ExternalAuthUtils.canUseGooglePlayServices()) {
-- setGCMEnabled(false);
-- Log.i(TAG, "Disabling Background Sync because Play Services is not up to date.");
-- isAvailable = false;
-- }
-- RecordHistogram.recordBooleanHistogram(
-- "BackgroundSync.LaunchTask.PlayServicesAvailable", isAvailable);
-- }
-- return !sGCMEnabled;
-+ return true;
- }
-
- @VisibleForTesting
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
@@ -97,111 +61,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroun
-
import org.chromium.base.Log;
import org.chromium.base.VisibleForTesting;
- import org.chromium.base.library_loader.ProcessInitException;
-@@ -27,67 +23,9 @@ import org.chromium.content_public.browser.UiThreadTaskTraits;
- * browser needs to be launched for scheduled tasks, or in response to changing network or power
- * conditions.
- */
--public class ChromeBackgroundService extends GcmTaskService {
-+public class ChromeBackgroundService {
- private static final String TAG = "BackgroundService";
-
-- @Override
-- @VisibleForTesting
-- public int onRunTask(final TaskParams params) {
-- final String taskTag = params.getTag();
-- final Context context = this;
-- PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
-- switch (taskTag) {
-- case BackgroundSyncLauncher.TASK_TAG:
-- handleBackgroundSyncEvent(context, taskTag);
-- break;
--
-- case OfflinePageUtils.TASK_TAG:
-- // Offline pages are migrating to BackgroundTaskScheduler, therefore getting
-- // a task through ChromeBackgroundSerivce should cause a rescheduling using
-- // the new component.
-- rescheduleOfflinePages();
-- break;
--
-- case SnippetsLauncher.TASK_TAG_WIFI:
-- case SnippetsLauncher.TASK_TAG_FALLBACK:
-- handleSnippetsOnPersistentSchedulerWakeUp(context, taskTag);
-- break;
--
-- // This is only for tests.
-- case ServiceManagerStartupUtils.TASK_TAG:
-- handleServicificationStartupTask(context, taskTag);
-- break;
--
-- default:
-- Log.i(TAG, "Unknown task tag " + taskTag);
-- break;
-- }
-- });
--
-- return GcmNetworkManager.RESULT_SUCCESS;
-- }
--
-- private void handleBackgroundSyncEvent(Context context, String tag) {
-- if (!BackgroundSyncLauncher.hasInstance()) {
-- // Start the browser. The browser's BackgroundSyncManager (for the active profile) will
-- // start, check the network, and run any necessary sync events. This task runs with a
-- // wake lock, but has a three minute timeout, so we need to start the browser in its
-- // own task.
-- // TODO(jkarlin): Protect the browser sync event with a wake lock.
-- // See crbug.com/486020.
-- launchBrowser(context, tag);
-- }
-- }
--
-- private void handleSnippetsOnPersistentSchedulerWakeUp(Context context, String tag) {
-- if (!SnippetsLauncher.hasInstance()) launchBrowser(context, tag);
-- snippetsOnPersistentSchedulerWakeUp();
-- }
--
-- private void handleServicificationStartupTask(Context context, String tag) {
-- launchBrowser(context, tag);
-- }
--
- @VisibleForTesting
- protected void snippetsOnPersistentSchedulerWakeUp() {
- SnippetsBridge.onPersistentSchedulerWakeUp();
-@@ -115,23 +53,8 @@ public class ChromeBackgroundService extends GcmTaskService {
- protected void rescheduleBackgroundSyncTasksOnUpgrade() {
- }
-
-- private void handleSnippetsOnBrowserUpgraded() {
-- if (SnippetsLauncher.shouldNotifyOnBrowserUpgraded()) {
-- if (!SnippetsLauncher.hasInstance()) {
-- launchBrowser(this, /*tag=*/""); // The |tag| doesn't matter here.
-- }
-- snippetsOnBrowserUpgraded();
-- }
-- }
--
- /** Reschedules offline pages (using appropriate version of Background Task Scheduler). */
- protected void rescheduleOfflinePages() {
- BackgroundScheduler.getInstance().reschedule();
- }
--
-- @Override
-- public void onInitializeTasks() {
-- rescheduleBackgroundSyncTasksOnUpgrade();
-- handleSnippetsOnBrowserUpgraded();
-- }
- }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
-@@ -167,6 +167,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
-
- // Ensure GCM has been initialized.
- ensureGcmIsInitialized();
-+ if (!mGcmInitialized) return;
-
- // Do not apply changes to {@link #mSessionInvalidationsEnabled} yet because the timer task
- // may be scheduled far into the future.
+ import org.chromium.base.task.PostTask;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
@@ -225,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/Ch
import com.google.ipc.invalidation.ticl.android2.channel.AndroidGcmController;
import org.chromium.base.ContextUtils;
-@@ -35,62 +34,9 @@ import org.chromium.content_public.browser.UiThreadTaskTraits;
+@@ -34,62 +33,9 @@ import org.chromium.content_public.browser.UiThreadTaskTraits;
/**
* Receives Downstream messages and status of upstream messages from GCM.
*/
@@ -289,15 +149,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/Ch
/**
* Returns if we deliver the GCMMessage with a background service by calling
* Context#startService. This will only work if Android has put us in a whitelist to allow
-@@ -225,8 +171,6 @@ public class ChromeGcmListenerService extends GcmListenerService {
-
- try {
- ChromeBrowserInitializer.getInstance(applicationContext).handleSynchronousStartup();
-- GCMDriver.dispatchMessage(message);
--
- } catch (ProcessInitException e) {
- Log.e(TAG, "ProcessInitException while starting the browser process");
+@@ -222,7 +168,6 @@ public class ChromeGcmListenerService extends GcmListenerService {
+ static void dispatchMessageToDriver(Context applicationContext, GCMMessage message) {
+ ThreadUtils.assertOnUiThread();
+ ChromeBrowserInitializer.getInstance(applicationContext).handleSynchronousStartup();
+- GCMDriver.dispatchMessage(message);
+ }
+ private static boolean isNativeLoaded() {
diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
--- a/components/background_task_scheduler/BUILD.gn
+++ b/components/background_task_scheduler/BUILD.gn
@@ -348,10 +207,11 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
private static final String TAG = "BkgrdTaskGcmTS";
private BackgroundTaskSchedulerGcmNetworkManager.Clock mClock = System::currentTimeMillis;
-@@ -90,63 +86,6 @@ public class BackgroundTaskGcmTaskService extends GcmTaskService {
+@@ -89,63 +85,6 @@ public class BackgroundTaskGcmTaskService extends GcmTaskService {
+ }
}
- @Override
+- @Override
- public int onRunTask(TaskParams params) {
- final TaskParameters taskParams =
- BackgroundTaskSchedulerGcmNetworkManager.getTaskParametersFromTaskParams(params);
@@ -408,10 +268,9 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
- return GcmNetworkManager.RESULT_SUCCESS;
- }
-
-- @Override
+ @Override
public void onInitializeTasks() {
// Ignore the event on OSs supporting JobScheduler.
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
@@ -431,7 +290,7 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
-@@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit;
+@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
* An implementation of {@link BackgroundTaskSchedulerDelegate} that uses the Play Services
* {@link GcmNetworkManager} to schedule jobs.
*/
@@ -440,7 +299,7 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
private static final String TAG = "BkgrdTaskSchedGcmNM";
/** Delta time for expiration checks, after the end time. */
-@@ -34,18 +34,6 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+@@ -35,18 +35,6 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
sClock = clock;
}
@@ -462,10 +321,11 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
-@@ -844,21 +844,6 @@ android_aar_prebuilt("google_play_services_fido_java") {
+@@ -875,21 +875,6 @@ android_aar_prebuilt("google_play_services_fido_java") {
+ strip_drawables = true
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_gcm_java") {
- aar_path = "libs/com_google_android_gms_play_services_gcm/play-services-gcm-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info"
@@ -480,10 +340,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_iid_java") {
aar_path = "libs/com_google_android_gms_play_services_iid/play-services-iid-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_iid/com_google_android_gms_play_services_iid.info"
diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
--- a/third_party/cacheinvalidation/BUILD.gn
+++ b/third_party/cacheinvalidation/BUILD.gn
@@ -552,7 +411,7 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
private Context context;
-@@ -64,33 +62,13 @@ public class AndroidGcmController {
+@@ -64,32 +62,12 @@ public class AndroidGcmController {
public static AndroidGcmController get(Context context) {
synchronized (lock) {
if (androidGcmController == null) {
@@ -564,7 +423,7 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
return androidGcmController;
}
- /**
+- /**
- * Override AndroidGcmController with a custom GcmNetworkManager in tests. This overrides the
- * existing instance of AndroidGcmController if any.
- *
@@ -583,10 +442,9 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
- this.gcmNetworkManager = gcmNetworkManager;
- }
-
-- /**
+ /**
* Returns true if no registration token is stored or the current application version is higher
* than the version for the token stored.
- */
@@ -142,21 +120,7 @@ public class AndroidGcmController {
return;
}
@@ -745,5 +603,5 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
- }
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch b/build/patches/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch
index 73e3da19..d3d6a8c0 100644
--- a/build/patches/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch
@@ -4,13 +4,13 @@ Subject: Remove dependency on com.google.android.gms.vision,
com.google.android.gms.clearcut, com.google.android.gms.phenotype
---
- services/BUILD.gn | 4 -
- services/shape_detection/BUILD.gn | 2 -
- .../shape_detection/BarcodeDetectionImpl.java | 114 +------------------
- .../BarcodeDetectionProviderImpl.java | 18 +--
- .../shape_detection/FaceDetectionImplGmsCore.java | 122 +--------------------
- .../shape_detection/TextDetectionImpl.java | 60 +---------
- third_party/android_deps/BUILD.gn | 66 -----------
+ services/BUILD.gn | 4 -
+ services/shape_detection/BUILD.gn | 2 -
+ .../shape_detection/BarcodeDetectionImpl.java | 114 +---------------
+ .../BarcodeDetectionProviderImpl.java | 18 +--
+ .../FaceDetectionImplGmsCore.java | 122 +-----------------
+ .../shape_detection/TextDetectionImpl.java | 60 +--------
+ third_party/android_deps/BUILD.gn | 66 ----------
7 files changed, 10 insertions(+), 376 deletions(-)
diff --git a/services/BUILD.gn b/services/BUILD.gn
@@ -483,10 +483,11 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
-@@ -900,35 +900,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
+@@ -931,35 +931,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
+ strip_drawables = true
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_vision_java") {
- aar_path = "libs/com_google_android_gms_play_services_vision/play-services-vision-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_vision/com_google_android_gms_play_services_vision.info"
@@ -515,14 +516,14 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_google_android_material_material_java") {
aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
- info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
-@@ -1528,25 +1499,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
+@@ -1541,25 +1512,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
+ ignore_aidl = true
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_clearcut_java") {
- aar_path = "libs/com_google_android_gms_play_services_clearcut/play-services-clearcut-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_clearcut/com_google_android_gms_play_services_clearcut.info"
@@ -541,14 +542,14 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_flags_java") {
aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
-@@ -1564,24 +1516,6 @@ android_aar_prebuilt("google_play_services_flags_java") {
+@@ -1577,24 +1529,6 @@ android_aar_prebuilt("google_play_services_flags_java") {
+ strip_drawables = true
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_phenotype_java") {
- aar_path = "libs/com_google_android_gms_play_services_phenotype/play-services-phenotype-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_phenotype/com_google_android_gms_play_services_phenotype.info"
@@ -566,10 +567,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
--# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_places_placereport_java") {
aar_path = "libs/com_google_android_gms_play_services_places_placereport/play-services-places-placereport-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_places_placereport/com_google_android_gms_play_services_places_placereport.info"
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-dependency-on-com.google.android.play.patch b/build/patches/Remove-dependency-on-com.google.android.play.patch
index 4c9730f1..a1559c58 100644
--- a/build/patches/Remove-dependency-on-com.google.android.play.patch
+++ b/build/patches/Remove-dependency-on-com.google.android.play.patch
@@ -3,18 +3,18 @@ Date: Fri, 1 Nov 2019 23:01:41 +0100
Subject: Remove dependency on com.google.android.play
---
- chrome/android/BUILD.gn | 1 -
- .../omaha/inline/FakeAppUpdateManagerWrapper.java | 60 +-----
- .../inline/InlineUpdateControllerFactory.java | 16 --
- .../omaha/inline/PlayInlineUpdateController.java | 226 +--------------------
- components/module_installer/android/BUILD.gn | 1 -
- third_party/google_android_play_core/BUILD.gn | 5 -
+ chrome/android/BUILD.gn | 1 -
+ .../inline/FakeAppUpdateManagerWrapper.java | 60 +----
+ .../inline/InlineUpdateControllerFactory.java | 16 --
+ .../inline/PlayInlineUpdateController.java | 226 +-----------------
+ components/module_installer/android/BUILD.gn | 1 -
+ third_party/google_android_play_core/BUILD.gn | 5 -
6 files changed, 3 insertions(+), 306 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -387,7 +387,6 @@ android_library("chrome_java") {
+@@ -378,7 +378,6 @@ android_library("chrome_java") {
"//third_party/cct_dynamic_module:cct_dynamic_module_java",
"//third_party/feed:feed_lib_proto_java",
"//third_party/gif_player:gif_player_java",
@@ -25,9 +25,9 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
-@@ -10,11 +10,6 @@ import android.os.Looper;
- import android.os.Message;
- import android.support.annotation.IntDef;
+@@ -11,11 +11,6 @@ import android.os.Message;
+
+ import androidx.annotation.IntDef;
-import com.google.android.play.core.appupdate.AppUpdateInfo;
-import com.google.android.play.core.appupdate.testing.FakeAppUpdateManager;
@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Fa
import org.chromium.base.ContextUtils;
import org.chromium.base.task.PostTask;
import org.chromium.chrome.browser.ChromeActivity;
-@@ -30,7 +25,7 @@ import java.lang.ref.WeakReference;
+@@ -31,7 +26,7 @@ import java.lang.ref.WeakReference;
* wrapper isn't meant to be used for a full integration test, but simulating all of the possible
* error cases is a bit easier to do here.
*/
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Fa
private static final int RESULT_IN_APP_UPDATE_FAILED = 1;
private static final int STEP_DELAY_MS = 5000;
private static final int TOAST_DURATION_MS = 2000;
-@@ -107,15 +102,12 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
+@@ -108,15 +103,12 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
switch (event) {
case Event.UPDATE_AVAILABLE:
w.toast("Making app update available.");
@@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Fa
return;
case Event.TRIGGER_DOWNLOAD:
w.toast("Triggering download.");
-@@ -123,27 +115,21 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
+@@ -124,27 +116,21 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
return;
case Event.DOWNLOAD_STARTS:
w.toast("Download has started.");
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Fa
return;
default:
w.toast("Unknown event.");
-@@ -158,56 +144,12 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
+@@ -159,56 +145,12 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
* @param endState at which point should the inline update flow end.
*/
FakeAppUpdateManagerWrapper(@Type int endState) {
@@ -183,9 +183,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/In
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
-@@ -9,15 +9,6 @@ import android.content.IntentSender.SendIntentException;
- import android.support.annotation.IntDef;
- import android.support.annotation.Nullable;
+@@ -10,15 +10,6 @@ import android.content.IntentSender.SendIntentException;
+ import androidx.annotation.IntDef;
+ import androidx.annotation.Nullable;
-import com.google.android.play.core.appupdate.AppUpdateInfo;
-import com.google.android.play.core.appupdate.AppUpdateManager;
@@ -199,7 +199,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Pl
import org.chromium.base.Log;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.chrome.browser.omaha.UpdateStatusProvider.UpdateState;
-@@ -31,7 +22,7 @@ import java.lang.annotation.RetentionPolicy;
+@@ -32,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
* in the foreground.
*/
public class PlayInlineUpdateController
@@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Pl
/**
* Converts Play's InstallErrorCode enum to a stable monotomically incrementing Chrome enum.
* This is used for metric stability.
-@@ -126,26 +117,9 @@ public class PlayInlineUpdateController
+@@ -127,26 +118,9 @@ public class PlayInlineUpdateController
private static final int RESULT_IN_APP_UPDATE_FAILED = 1;
private static final int REQUEST_CODE = 8123;
@@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Pl
// InlineUpdateController implementation.
@Override
public void setEnabled(boolean enabled) {
-@@ -154,10 +128,8 @@ public class PlayInlineUpdateController
+@@ -155,10 +129,8 @@ public class PlayInlineUpdateController
if (mEnabled) {
mUpdateState = UpdateState.NONE;
@@ -246,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Pl
}
}
-@@ -168,220 +140,26 @@ public class PlayInlineUpdateController
+@@ -169,220 +141,26 @@ public class PlayInlineUpdateController
@Override
public void startUpdate(Activity activity) {
@@ -471,14 +471,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Pl
diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn
--- a/components/module_installer/android/BUILD.gn
+++ b/components/module_installer/android/BUILD.gn
-@@ -23,7 +23,6 @@ android_library("module_installer_java") {
- deps = [
+@@ -34,7 +34,6 @@ android_library("module_installer_java") {
"//base:base_java",
+ "//base:jni_java",
"//components/crash/android:java",
- "//third_party/google_android_play_core:com_google_android_play_core_java",
]
- srcjar_deps = [ ":module_installer_build_config" ]
+ annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/third_party/google_android_play_core/BUILD.gn b/third_party/google_android_play_core/BUILD.gn
--- a/third_party/google_android_play_core/BUILD.gn
+++ b/third_party/google_android_play_core/BUILD.gn
@@ -492,5 +492,5 @@ diff --git a/third_party/google_android_play_core/BUILD.gn b/third_party/google_
- info_path = "com_google_android_play_core.info"
-}
--
-2.11.0
+2.17.1
diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch
index c890338d..ec80f4c2 100644
--- a/build/patches/Remove-help-menu-item.patch
+++ b/build/patches/Remove-help-menu-item.patch
@@ -3,11 +3,11 @@ Date: Wed, 27 Jun 2018 01:32:28 +0200
Subject: Remove help menu item
---
- chrome/android/java/res/menu/main_menu.xml | 2 --
- .../java/src/org/chromium/chrome/browser/ChromeActivity.java | 9 ---------
- .../java/src/org/chromium/chrome/browser/KeyboardShortcuts.java | 3 ---
- .../chromium/chrome/browser/customtabs/CustomTabActivity.java | 2 +-
- .../chrome/browser/directactions/MenuDirectActionHandler.java | 2 --
+ chrome/android/java/res/menu/main_menu.xml | 2 --
+ .../src/org/chromium/chrome/browser/ChromeActivity.java | 9 ---------
+ .../org/chromium/chrome/browser/KeyboardShortcuts.java | 3 ---
+ .../chrome/browser/customtabs/CustomTabActivity.java | 2 +-
+ .../browser/directactions/MenuDirectActionHandler.java | 2 --
5 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2076,15 +2076,6 @@ public abstract class ChromeActivity
+@@ -2143,15 +2143,6 @@ public abstract class ChromeActivity
final Tab currentTab = getActivityTab();
@@ -44,7 +44,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
-@@ -338,9 +338,6 @@ public class KeyboardShortcuts {
+@@ -342,9 +342,6 @@ public class KeyboardShortcuts {
tab = activity.getActivityTab();
if (tab != null && tab.canGoForward()) tab.goForward();
return true;
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -624,7 +624,7 @@ public class CustomTabActivity extends ChromeActivity
-Date: Sat, 2 Nov 2019 16:27:51 +0100
-Subject: Remove play dependency for module installer
-
----
- .../FakeModuleInstallerBackend.java | 16 +-
- .../module_installer/ModuleInstallerImpl.java | 150 ---------------
- .../PlayCoreModuleInstallerBackend.java | 210 +--------------------
- 3 files changed, 10 insertions(+), 366 deletions(-)
-
-diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/FakeModuleInstallerBackend.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/FakeModuleInstallerBackend.java
---- a/components/module_installer/android/java/src/org/chromium/components/module_installer/FakeModuleInstallerBackend.java
-+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/FakeModuleInstallerBackend.java
-@@ -7,9 +7,6 @@ package org.chromium.components.module_installer;
- import android.content.Context;
- import android.content.pm.PackageManager;
-
--import com.google.android.play.core.splitcompat.SplitCompat;
--import com.google.android.play.core.splitcompat.ingestion.Verifier;
--
- import org.chromium.base.BuildInfo;
- import org.chromium.base.ContextUtils;
- import org.chromium.base.Log;
-@@ -132,18 +129,7 @@ class FakeModuleInstallerBackend extends ModuleInstallerBackend {
- return false;
- }
-
-- // Check that the module's signature matches Chrome's.
-- try {
-- Verifier verifier = new Verifier(context);
-- if (!verifier.verifySplits()) {
-- return false;
-- }
-- } catch (IOException | PackageManager.NameNotFoundException e) {
-- return false;
-- }
--
-- // Tell SplitCompat to do a full emulation of the module.
-- return SplitCompat.fullInstall(context);
-+ return false;
- }
-
- private File joinPaths(String... paths) {
-diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/ModuleInstallerImpl.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/ModuleInstallerImpl.java
---- a/components/module_installer/android/java/src/org/chromium/components/module_installer/ModuleInstallerImpl.java
-+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/ModuleInstallerImpl.java
-@@ -11,9 +11,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
- import android.os.Build;
- import android.text.TextUtils;
-
--import com.google.android.play.core.splitcompat.SplitCompat;
--import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
--
- import org.chromium.base.BuildInfo;
- import org.chromium.base.CommandLine;
- import org.chromium.base.ContextUtils;
-@@ -57,152 +54,5 @@ import java.util.TreeSet;
- sInstance = moduleInstaller;
- }
-
-- @Override
-- public void init() {
-- try (Timer ignored1 = new Timer()) {
-- if (sAppContextSplitCompatted) return;
-- // SplitCompat.install may copy modules into Chrome's internal folder or clean them up.
-- try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
-- SplitCompat.install(ContextUtils.getApplicationContext());
-- sAppContextSplitCompatted = true;
-- }
-- // SplitCompat.install may add emulated modules. Thus, update crash keys.
-- updateCrashKeys();
-- }
-- }
--
-- @Override
-- public void initActivity(Activity activity) {
-- try (Timer ignored = new Timer()) {
-- // SplitCompat#install should always be run for the application first before it is run
-- // for any activities.
-- init();
-- SplitCompat.installActivity(activity);
-- }
-- }
--
-- @Override
-- public void recordModuleAvailability() {
-- try (Timer ignored = new Timer()) {
-- getBackend().recordModuleAvailability();
-- }
-- }
--
-- @Override
-- public void recordStartupTime() {
-- getBackend().recordStartupTime(Timer.getTotalTime());
-- }
--
-- @Override
-- public void updateCrashKeys() {
-- try (Timer ignored = new Timer()) {
-- Context context = ContextUtils.getApplicationContext();
--
-- // Get modules that are fully installed as split APKs (excluding base which is always
-- // installed). Tree set to have ordered and, thus, deterministic results.
-- Set fullyInstalledModules = new TreeSet<>();
-- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-- // Split APKs are only supported on Android L+.
-- try {
-- PackageInfo packageInfo = context.getPackageManager().getPackageInfo(
-- BuildInfo.getInstance().packageName, 0);
-- if (packageInfo.splitNames != null) {
-- fullyInstalledModules.addAll(Arrays.asList(packageInfo.splitNames));
-- }
-- } catch (NameNotFoundException e) {
-- throw new RuntimeException(e);
-- }
-- }
--
-- // Create temporary split install manager to retrieve both fully installed and emulated
-- // modules. Then remove fully installed ones to get emulated ones only. Querying the
-- // installed modules can only be done if splitcompat has already been called. Otherwise,
-- // emulation of later modules won't work. If splitcompat has not been called no modules
-- // are emulated. Therefore, use an empty set in that case.
-- Set emulatedModules = new TreeSet<>();
-- if (sAppContextSplitCompatted) {
-- emulatedModules.addAll(
-- SplitInstallManagerFactory.create(context).getInstalledModules());
-- emulatedModules.removeAll(fullyInstalledModules);
-- }
--
-- CrashKeys.getInstance().set(
-- CrashKeyIndex.INSTALLED_MODULES, encodeCrashKeyValue(fullyInstalledModules));
-- CrashKeys.getInstance().set(
-- CrashKeyIndex.EMULATED_MODULES, encodeCrashKeyValue(emulatedModules));
-- }
-- }
--
-- @Override
-- public void install(String moduleName, OnModuleInstallFinishedListener onFinishedListener) {
-- try (Timer ignored = new Timer()) {
-- ThreadUtils.assertOnUiThread();
--
-- if (!mModuleNameListenerMap.containsKey(moduleName)) {
-- mModuleNameListenerMap.put(moduleName, new LinkedList<>());
-- }
-- List onFinishedListeners =
-- mModuleNameListenerMap.get(moduleName);
-- onFinishedListeners.add(onFinishedListener);
-- if (onFinishedListeners.size() > 1) {
-- // Request is already running.
-- return;
-- }
-- getBackend().install(moduleName);
-- }
-- }
--
-- @Override
-- public void installDeferred(String moduleName) {
-- try (Timer ignored = new Timer()) {
-- ThreadUtils.assertOnUiThread();
-- getBackend().installDeferred(moduleName);
-- }
-- }
--
-- private void onFinished(boolean success, List moduleNames) {
-- // Add timer to this private method since it is passed as a callback.
-- try (Timer ignored = new Timer()) {
-- ThreadUtils.assertOnUiThread();
--
-- mActivityObserver.onModuleInstalled();
--
-- for (String moduleName : moduleNames) {
-- List onFinishedListeners =
-- mModuleNameListenerMap.get(moduleName);
-- if (onFinishedListeners == null) continue;
--
-- for (OnModuleInstallFinishedListener listener : onFinishedListeners) {
-- listener.onFinished(success);
-- }
-- mModuleNameListenerMap.remove(moduleName);
-- }
--
-- if (mModuleNameListenerMap.isEmpty()) {
-- mBackend.close();
-- mBackend = null;
-- }
--
-- updateCrashKeys();
-- }
-- }
--
-- private ModuleInstallerBackend getBackend() {
-- if (mBackend == null) {
-- ModuleInstallerBackend.OnFinishedListener listener = this::onFinished;
-- mBackend = CommandLine.getInstance().hasSwitch(FAKE_FEATURE_MODULE_INSTALL)
-- ? new FakeModuleInstallerBackend(listener)
-- : new PlayCoreModuleInstallerBackend(listener);
-- }
-- return mBackend;
-- }
--
-- private String encodeCrashKeyValue(Set moduleNames) {
-- if (moduleNames.isEmpty()) return "";
-- // Values with dots are interpreted as URLs. Some module names have dots in them. Make sure
-- // they don't get sanitized.
-- return TextUtils.join(",", moduleNames).replace('.', '$');
-- }
--
- private ModuleInstallerImpl() {}
- }
-diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/PlayCoreModuleInstallerBackend.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/PlayCoreModuleInstallerBackend.java
---- a/components/module_installer/android/java/src/org/chromium/components/module_installer/PlayCoreModuleInstallerBackend.java
-+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/PlayCoreModuleInstallerBackend.java
-@@ -7,15 +7,6 @@ package org.chromium.components.module_installer;
- import android.content.SharedPreferences;
- import android.util.SparseLongArray;
-
--import com.google.android.play.core.splitinstall.SplitInstallException;
--import com.google.android.play.core.splitinstall.SplitInstallManager;
--import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
--import com.google.android.play.core.splitinstall.SplitInstallRequest;
--import com.google.android.play.core.splitinstall.SplitInstallSessionState;
--import com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener;
--import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
--import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
--
- import org.chromium.base.ContextUtils;
- import org.chromium.base.Log;
- import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
-@@ -33,14 +24,13 @@ import java.util.Set;
- * Backend that uses the Play Core SDK to download a module from Play and install it subsequently.
- */
- /* package */ class PlayCoreModuleInstallerBackend
-- extends ModuleInstallerBackend implements SplitInstallStateUpdatedListener {
-+ extends ModuleInstallerBackend {
- private static class InstallTimes {
- public final boolean mIsCached;
- public final SparseLongArray mInstallTimes = new SparseLongArray();
-
- public InstallTimes(boolean isCached) {
- mIsCached = isCached;
-- mInstallTimes.put(SplitInstallSessionStatus.UNKNOWN, System.currentTimeMillis());
- }
- }
-
-@@ -50,7 +40,6 @@ import java.util.Set;
- private static final String KEY_MODULES_DEFERRED_REQUESTED_PREVIOUSLY =
- "key_modules_deferred_requested_previously";
- private final Map mInstallTimesMap = new HashMap<>();
-- private final SplitInstallManager mManager;
- private boolean mIsClosed;
-
- // FeatureModuleInstallStatus defined in //tools/metrics/histograms/enums.xml.
-@@ -90,183 +79,31 @@ import java.util.Set;
- // Keep this one at the end and increment appropriately when adding new status.
- private static final int AVAILABILITY_STATUS_COUNT = 3;
-
-- /** Records via UMA all modules that have been requested and are currently installed. */
-- @Override
-- /* package */ void recordModuleAvailability() {
-- SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
-- Set requestedModules = new HashSet<>();
-- requestedModules.addAll(
-- prefs.getStringSet(KEY_MODULES_ONDEMAND_REQUESTED_PREVIOUSLY, new HashSet<>()));
-- requestedModules.addAll(
-- prefs.getStringSet(KEY_MODULES_DEFERRED_REQUESTED_PREVIOUSLY, new HashSet<>()));
-- Set installedModules = mManager.getInstalledModules();
--
-- for (String name : requestedModules) {
-- EnumeratedHistogramSample sample = new EnumeratedHistogramSample(
-- "Android.FeatureModules.AvailabilityStatus." + name, AVAILABILITY_STATUS_COUNT);
-- if (installedModules.contains(name)) {
-- sample.record(AVAILABILITY_STATUS_INSTALLED_REQUESTED);
-- } else {
-- sample.record(AVAILABILITY_STATUS_REQUESTED);
-- }
-- }
--
-- for (String name : installedModules) {
-- if (!requestedModules.contains(name)) {
-- // Module appeared without being requested. Weird.
-- EnumeratedHistogramSample sample = new EnumeratedHistogramSample(
-- "Android.FeatureModules.AvailabilityStatus." + name,
-- AVAILABILITY_STATUS_COUNT);
-- sample.record(AVAILABILITY_STATUS_INSTALLED_UNREQUESTED);
-- }
-- }
-- }
--
-- @Override
-- /* package */ void recordStartupTime(long durationMs) {
-- TimesHistogramSample sample =
-- new TimesHistogramSample("Android.FeatureModules.StartupTime");
-- sample.record(durationMs);
-- }
--
- /* package */ PlayCoreModuleInstallerBackend(OnFinishedListener listener) {
- super(listener);
-- // MUST call init before creating a SplitInstallManager.
-- ModuleInstaller.getInstance().init();
-- mManager = SplitInstallManagerFactory.create(ContextUtils.getApplicationContext());
-- mManager.registerListener(this);
- }
-
- @Override
-- public void install(String moduleName) {
-+ public void close() {
- assert !mIsClosed;
--
-- // Record start time in order to later report the install duration via UMA. We want to make
-- // a difference between modules that have been requested first before and after the last
-- // Chrome start. Modules that have been requested before may install quicker as they may be
-- // installed form cache. To do this, we use shared prefs to track modules previously
-- // requested. Additionally, storing requested modules helps us to record module install
-- // status at next Chrome start.
-- assert !mInstallTimesMap.containsKey(moduleName);
-- mInstallTimesMap.put(moduleName,
-- new InstallTimes(storeModuleRequested(
-- moduleName, KEY_MODULES_ONDEMAND_REQUESTED_PREVIOUSLY)));
--
-- SplitInstallRequest request =
-- SplitInstallRequest.newBuilder().addModule(moduleName).build();
--
-- mManager.startInstall(request).addOnFailureListener(exception -> {
-- int status = exception instanceof SplitInstallException
-- ? getHistogramCode(((SplitInstallException) exception).getErrorCode())
-- : INSTALL_STATUS_UNKNOWN_REQUEST_ERROR;
-- Log.e(TAG, "Failed to request module '%s': error code %s", moduleName, status);
-- // If we reach this error condition |onStateUpdate| won't be called. Thus, call
-- // |onFinished| here.
-- finish(false, Collections.singletonList(moduleName), status);
-- });
-+ mIsClosed = true;
- }
-
- @Override
-- public void installDeferred(String moduleName) {
-- assert !mIsClosed;
-- mManager.deferredInstall(Collections.singletonList(moduleName));
-- storeModuleRequested(moduleName, KEY_MODULES_DEFERRED_REQUESTED_PREVIOUSLY);
-+ /* package */ void recordModuleAvailability() {
-+ SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
- }
-
- @Override
-- public void close() {
-- assert !mIsClosed;
-- mManager.unregisterListener(this);
-- mIsClosed = true;
-+ /* package */ void recordStartupTime(long durationMs) {
- }
-
- @Override
-- public void onStateUpdate(SplitInstallSessionState state) {
-- assert !mIsClosed;
-- Log.i(TAG, "Status for modules '%s' updated to %d", state.moduleNames(), state.status());
-- switch (state.status()) {
-- case SplitInstallSessionStatus.DOWNLOADING:
-- case SplitInstallSessionStatus.INSTALLING:
-- case SplitInstallSessionStatus.INSTALLED:
-- for (String name : state.moduleNames()) {
-- mInstallTimesMap.get(name).mInstallTimes.put(
-- state.status(), System.currentTimeMillis());
-- }
-- if (state.status() == SplitInstallSessionStatus.INSTALLED) {
-- finish(true, state.moduleNames(), INSTALL_STATUS_SUCCESS);
-- }
-- break;
-- // DOWNLOADED only gets sent if SplitCompat is not enabled. That's an error.
-- // SplitCompat should always be enabled.
-- case SplitInstallSessionStatus.DOWNLOADED:
-- case SplitInstallSessionStatus.CANCELED:
-- case SplitInstallSessionStatus.FAILED:
-- int status;
-- if (state.status() == SplitInstallSessionStatus.DOWNLOADED) {
-- status = INSTALL_STATUS_NO_SPLITCOMPAT;
-- } else if (state.status() == SplitInstallSessionStatus.CANCELED) {
-- status = INSTALL_STATUS_CANCELLATION;
-- } else {
-- status = getHistogramCode(state.errorCode());
-- }
-- Log.e(TAG, "Failed to install modules '%s': error code %s", state.moduleNames(),
-- status);
-- finish(false, state.moduleNames(), status);
-- break;
-- }
-- }
--
-- private void finish(boolean success, List moduleNames, int eventId) {
-- for (String name : moduleNames) {
-- RecordHistogram.recordEnumeratedHistogram(
-- "Android.FeatureModules.InstallStatus." + name, eventId, INSTALL_STATUS_COUNT);
-- if (success) {
-- recordInstallTimes(name);
-- }
-- }
-- onFinished(success, moduleNames);
-+ public void install(String moduleName) {
- }
-
-- /**
-- * Gets the UMA code based on a SplitInstall error code
-- * @param errorCode The error code
-- * @return int The User Metric Analysis code
-- */
-- private int getHistogramCode(@SplitInstallErrorCode int errorCode) {
-- switch (errorCode) {
-- case SplitInstallErrorCode.ACCESS_DENIED:
-- return INSTALL_STATUS_ACCESS_DENIED;
-- case SplitInstallErrorCode.ACTIVE_SESSIONS_LIMIT_EXCEEDED:
-- return INSTALL_STATUS_ACTIVE_SESSIONS_LIMIT_EXCEEDED;
-- case SplitInstallErrorCode.API_NOT_AVAILABLE:
-- return INSTALL_STATUS_API_NOT_AVAILABLE;
-- case SplitInstallErrorCode.INCOMPATIBLE_WITH_EXISTING_SESSION:
-- return INSTALL_STATUS_INCOMPATIBLE_WITH_EXISTING_SESSION;
-- case SplitInstallErrorCode.INSUFFICIENT_STORAGE:
-- return INSTALL_STATUS_INSUFFICIENT_STORAGE;
-- case SplitInstallErrorCode.INVALID_REQUEST:
-- return INSTALL_STATUS_INVALID_REQUEST;
-- case SplitInstallErrorCode.MODULE_UNAVAILABLE:
-- return INSTALL_STATUS_MODULE_UNAVAILABLE;
-- case SplitInstallErrorCode.NETWORK_ERROR:
-- return INSTALL_STATUS_NETWORK_ERROR;
-- case SplitInstallErrorCode.NO_ERROR:
-- return INSTALL_STATUS_NO_ERROR;
-- case SplitInstallErrorCode.SERVICE_DIED:
-- return INSTALL_STATUS_SERVICE_DIED;
-- case SplitInstallErrorCode.SESSION_NOT_FOUND:
-- return INSTALL_STATUS_SESSION_NOT_FOUND;
-- case SplitInstallErrorCode.SPLITCOMPAT_COPY_ERROR:
-- return INSTALL_STATUS_SPLITCOMPAT_COPY_ERROR;
-- case SplitInstallErrorCode.SPLITCOMPAT_EMULATION_ERROR:
-- return INSTALL_STATUS_SPLITCOMPAT_EMULATION_ERROR;
-- case SplitInstallErrorCode.SPLITCOMPAT_VERIFICATION_ERROR:
-- return INSTALL_STATUS_SPLITCOMPAT_VERIFICATION_ERROR;
-- case SplitInstallErrorCode.INTERNAL_ERROR:
-- return INSTALL_STATUS_INTERNAL_ERROR;
-- default:
-- return INSTALL_STATUS_UNKNOWN_SPLITINSTALL_ERROR;
-- }
-+ @Override
-+ public void installDeferred(String moduleName) {
- }
-
- /**
-@@ -286,33 +123,4 @@ import java.util.Set;
- editor.apply();
- return modulesRequestedPreviously.contains(moduleName);
- }
--
-- /** Records via UMA module install times divided into install steps. */
-- private void recordInstallTimes(String moduleName) {
-- recordInstallTime(moduleName, "", SplitInstallSessionStatus.UNKNOWN,
-- SplitInstallSessionStatus.INSTALLED);
-- recordInstallTime(moduleName, ".PendingDownload", SplitInstallSessionStatus.UNKNOWN,
-- SplitInstallSessionStatus.DOWNLOADING);
-- recordInstallTime(moduleName, ".Download", SplitInstallSessionStatus.DOWNLOADING,
-- SplitInstallSessionStatus.INSTALLING);
-- recordInstallTime(moduleName, ".Installing", SplitInstallSessionStatus.INSTALLING,
-- SplitInstallSessionStatus.INSTALLED);
-- }
--
-- private void recordInstallTime(
-- String moduleName, String histogramSubname, int startKey, int endKey) {
-- assert mInstallTimesMap.containsKey(moduleName);
-- InstallTimes installTimes = mInstallTimesMap.get(moduleName);
-- if (installTimes.mInstallTimes.get(startKey) == 0
-- || installTimes.mInstallTimes.get(endKey) == 0) {
-- // Time stamps for install times have not been stored. Don't record anything to not skew
-- // data.
-- return;
-- }
-- RecordHistogram.recordLongTimesHistogram(
-- String.format("Android.FeatureModules.%sInstallDuration%s.%s",
-- installTimes.mIsCached ? "Cached" : "Uncached", histogramSubname,
-- moduleName),
-- installTimes.mInstallTimes.get(endKey) - installTimes.mInstallTimes.get(startKey));
-- }
- }
---
-2.11.0
-
diff --git a/build/patches/Remove-signin-and-data-saver-integrations.patch b/build/patches/Remove-signin-and-data-saver-integrations.patch
index 31e3c598..1d1f7684 100644
--- a/build/patches/Remove-signin-and-data-saver-integrations.patch
+++ b/build/patches/Remove-signin-and-data-saver-integrations.patch
@@ -16,30 +16,30 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
>>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
>>> impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
---
- chrome/android/BUILD.gn | 4 +-
- chrome/android/java/AndroidManifest.xml | 27 -----
- chrome/android/java/res/xml/main_preferences.xml | 14 ---
- .../chromium/chrome/browser/ChromeActivity.java | 34 ------
- .../browser/preferences/MainPreferences.java | 86 +--------------
- .../DataReductionPreferenceFragment.java | 17 +--
- .../preferences/privacy/PrivacyPreferences.java | 15 ---
- .../sync/SyncAndServicesPreferences.java | 7 --
- .../preferences/sync/SyncPreferenceUtils.java | 3 -
- .../chrome/browser/signin/SigninManager.java | 73 +-----------
- .../java/strings/android_chrome_strings.grd | 18 ---
- .../android/signin/signin_manager_android.cc | 3 +-
- .../invalidation/impl/invalidation_service_util.cc | 21 ----
- .../invalidation/impl/invalidation_service_util.h | 6 +-
- .../signin/SystemAccountManagerDelegate.java | 38 +------
- .../components/sync/AndroidSyncSettings.java | 24 +---
- .../chromium/net/HttpNegotiateAuthenticator.java | 122 +--------------------
- .../chromoting/base/OAuthTokenFetcher.java | 2 -
- 18 files changed, 26 insertions(+), 488 deletions(-)
+ chrome/android/BUILD.gn | 3 +-
+ chrome/android/java/AndroidManifest.xml | 28 ------
+ .../android/java/res/xml/main_preferences.xml | 14 ---
+ .../chrome/browser/ChromeActivity.java | 34 -------
+ .../browser/preferences/MainPreferences.java | 86 +-----------------
+ .../DataReductionPreferenceFragment.java | 24 ++---
+ .../privacy/PrivacyPreferences.java | 15 ----
+ .../sync/SyncAndServicesPreferences.java | 8 --
+ .../preferences/sync/SyncPreferenceUtils.java | 3 -
+ .../chrome/browser/signin/SigninManager.java | 71 ++-------------
+ .../java/strings/android_chrome_strings.grd | 18 ----
+ .../android/signin/signin_manager_android.cc | 1 -
+ .../impl/invalidation_service_util.cc | 21 -----
+ .../impl/invalidation_service_util.h | 6 +-
+ .../signin/SystemAccountManagerDelegate.java | 38 +-------
+ .../components/sync/AndroidSyncSettings.java | 24 +----
+ .../net/HttpNegotiateAuthenticator.java | 88 +------------------
+ .../chromoting/base/OAuthTokenFetcher.java | 2 -
+ 18 files changed, 26 insertions(+), 458 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -1158,8 +1158,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+@@ -1136,8 +1136,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
resources = [
"java/res_template/xml/file_paths.xml",
"java/res_template/xml/launchershortcuts.xml",
@@ -49,18 +49,10 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
]
res_dir = "java/res_template"
variables = [ "manifest_package=$chrome_public_manifest_package" ]
-@@ -1170,7 +1169,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
- "java/res_template/xml/file_paths.xml",
- "java/res_template/xml/launchershortcuts.xml",
- "java/res_template/xml/searchable.xml",
-- "java/res_template/xml/syncadapter.xml",
- ]
- res_dir = "java/res_template"
-
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
-@@ -47,22 +47,16 @@ by a child template that "extends" this file.
+@@ -43,22 +43,16 @@ by a child template that "extends" this file.
{% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}
{% endif %}
@@ -83,7 +75,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
{% set enable_vr = enable_vr|default(0) %}
{% if enable_vr == "true" %}
-@@ -103,8 +97,6 @@ by a child template that "extends" this file.
+@@ -99,8 +93,6 @@ by a child template that "extends" this file.
@@ -92,7 +84,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
{% block extra_uses_permissions %}
{% endblock %}
-@@ -1009,16 +1001,6 @@ by a child template that "extends" this file.
+@@ -960,16 +952,6 @@ by a child template that "extends" this file.
android:resource="@xml/file_paths" />
@@ -109,29 +101,31 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
-@@ -1126,15 +1108,6 @@ by a child template that "extends" this file.
+@@ -1077,16 +1059,6 @@ by a child template that "extends" this file.
-
--
--
--
--
--
--
-
+-
+-
+-
+-
+
+
-
-
@@ -140,26 +134,25 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
- android:order="1"
- android:title="@string/sign_in_to_chrome"/>
-
--
-@@ -85,11 +76,6 @@
+@@ -84,11 +75,6 @@
+ android:key="languages"
android:order="16"
android:title="@string/prefs_languages"/>
-
--
+@@ -268,9 +266,6 @@ public abstract class ChromeActivity
@SuppressLint("NewApi")
private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
@@ -178,7 +171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
@Nullable
private ChromeFullscreenManager mFullscreenManager;
-@@ -906,28 +901,6 @@ public abstract class ChromeActivity
+@@ -919,28 +914,6 @@ public abstract class ChromeActivity
private void createContextReporterIfNeeded() {
if (!mStarted) return; // Sync state reporting should work only in started state.
if (mContextReporter != null || getActivityTab() == null) return;
@@ -207,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
}
@Override
-@@ -995,13 +968,6 @@ public abstract class ChromeActivity
+@@ -1008,13 +981,6 @@ public abstract class ChromeActivity
if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
GSAAccountChangeListener.getInstance().disconnect();
}
@@ -335,7 +328,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
updateSearchEnginePreference();
Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
-@@ -223,10 +185,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -220,10 +182,6 @@ public class MainPreferences extends PreferenceFragmentCompat
} else {
removePreferenceIfPresent(PREF_DEVELOPER);
}
@@ -346,7 +339,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
}
private Preference addPreferenceIfAbsent(String key) {
-@@ -240,13 +198,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -237,13 +195,6 @@ public class MainPreferences extends PreferenceFragmentCompat
if (preference != null) getPreferenceScreen().removePreference(preference);
}
@@ -360,8 +353,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
private void updateSearchEnginePreference() {
if (!TemplateUrlServiceFactory.get().isLoaded()) {
ChromeBasePreference searchEnginePref =
-@@ -278,28 +229,6 @@ public class MainPreferences extends PreferenceFragmentCompat
- pref.setSummary(getResources().getString(isOn ? R.string.text_on : R.string.text_off));
+@@ -275,28 +226,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+ pref.setSummary(isOn ? R.string.text_on : R.string.text_off);
}
- // SigninManager.SignInStateObserver implementation.
@@ -389,7 +382,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
// TemplateUrlService.LoadListener implementation.
@Override
public void onTemplateUrlServiceLoaded() {
-@@ -307,11 +236,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -304,11 +233,6 @@ public class MainPreferences extends PreferenceFragmentCompat
updateSearchEnginePreference();
}
@@ -401,7 +394,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
@VisibleForTesting
ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
return mManagedPreferenceDelegate;
-@@ -321,9 +245,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -318,9 +242,6 @@ public class MainPreferences extends PreferenceFragmentCompat
return new ManagedPreferenceDelegate() {
@Override
public boolean isPreferenceControlledByPolicy(Preference preference) {
@@ -411,7 +404,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
return TemplateUrlServiceFactory.get().isDefaultSearchManaged();
}
-@@ -332,11 +253,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -329,11 +250,6 @@ public class MainPreferences extends PreferenceFragmentCompat
@Override
public boolean isPreferenceClickDisabledByPolicy(Preference preference) {
@@ -426,7 +419,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
-@@ -45,10 +45,10 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
+@@ -50,10 +50,10 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
PreferenceUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences);
getActivity().setTitle(R.string.data_reduction_title_lite_mode);
@@ -441,13 +434,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/dat
setHasOptionsMenu(true);
-@@ -143,14 +143,7 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
+@@ -148,21 +148,7 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
* Returns summary string.
*/
public static String generateSummary(Resources resources) {
- if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) {
-- String percent =
-- DataReductionProxySettings.getInstance().getContentLengthPercentSavings();
+- ContentLengths length = DataReductionProxySettings.getInstance().getContentLengths();
+-
+- // If received is less than show chart threshold than don't show summary.
+- if (ConversionUtils.bytesToKilobytes(length.getReceived())
+- < DataReductionProxySettings.DATA_REDUCTION_SHOW_CHART_KB_THRESHOLD) {
+- return "";
+- }
+-
+- String percent = generatePercentSavings(length);
- return resources.getString(
- R.string.data_reduction_menu_item_summary_lite_mode, percent);
- } else {
@@ -456,7 +456,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/dat
+ return (String) resources.getText(R.string.text_off);
}
- private void createDataReductionSwitch(boolean isEnabled) {
+ /**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -502,7 +502,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncAndServicesPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncAndServicesPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncAndServicesPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncAndServicesPreferences.java
-@@ -163,14 +163,7 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
+@@ -167,15 +167,7 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
mPrivacyPrefManager.migrateNetworkPredictionPreferences();
@@ -513,6 +513,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/syn
- assert actionBar != null;
- actionBar.setHomeActionContentDescription(
- R.string.prefs_sync_and_services_content_description);
+- RecordUserAction.record("Signin_Signin_ShowAdvancedSyncSettings");
- }
PreferenceUtils.addPreferencesFromResource(this, R.xml.sync_and_services_preferences);
@@ -520,8 +521,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/syn
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java
-@@ -119,9 +119,6 @@ public class SyncPreferenceUtils {
- if (profileSyncService.isPassphraseRequiredForDecryption()) {
+@@ -118,9 +118,6 @@ public class SyncPreferenceUtils {
+ if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) {
return res.getString(R.string.sync_need_passphrase);
}
- if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
@@ -533,75 +534,79 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/syn
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
-@@ -27,10 +27,7 @@ import org.chromium.base.metrics.RecordUserAction;
+@@ -23,10 +23,7 @@ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.base.metrics.RecordUserAction;
import org.chromium.base.task.PostTask;
import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
- import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
-import org.chromium.components.signin.AccountIdProvider;
import org.chromium.components.signin.AccountManagerFacade;
-import org.chromium.components.signin.AccountTrackerService;
-import org.chromium.components.signin.ChromeSigninController;
- import org.chromium.components.sync.AndroidSyncSettings;
- import org.chromium.content_public.browser.UiThreadTaskTraits;
-
-@@ -47,7 +44,7 @@ import java.util.List;
- *
+ import org.chromium.components.signin.identitymanager.ClearAccountsAction;
+ import org.chromium.components.signin.identitymanager.CoreAccountInfo;
+ import org.chromium.components.signin.identitymanager.IdentityManager;
+@@ -52,7 +49,7 @@ import java.util.List;
* See chrome/browser/signin/signin_manager_android.h for more details.
*/
--public class SigninManager implements AccountTrackerService.OnSystemAccountsSeededListener {
-+public class SigninManager {
+ public class SigninManager
+- implements AccountTrackerService.OnSystemAccountsSeededListener, IdentityManager.Observer {
++ implements IdentityManager.Observer {
private static final String TAG = "SigninManager";
/**
-@@ -183,7 +180,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+@@ -168,7 +165,6 @@ public class SigninManager
+ * This is not final, as destroy() updates this.
*/
private long mNativeSigninManagerAndroid;
- private final Context mContext;
- private final AccountTrackerService mAccountTrackerService;
+ private final IdentityManager mIdentityManager;
+ private final IdentityMutator mIdentityMutator;
private final AndroidSyncSettings mAndroidSyncSettings;
- private final ObserverList mSignInStateObservers = new ObserverList<>();
- private final ObserverList mSignInAllowedObservers =
-@@ -219,28 +215,24 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+@@ -205,24 +201,22 @@ public class SigninManager
*/
@CalledByNative
- private static SigninManager create(
-- long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService) {
-+ long nativeSigninManagerAndroid) {
+ private static SigninManager create(long nativeSigninManagerAndroid,
+- AccountTrackerService accountTrackerService, IdentityManager identityManager,
++ IdentityManager identityManager,
+ IdentityMutator identityMutator) {
assert nativeSigninManagerAndroid != 0;
- assert accountTrackerService != null;
- return new SigninManager(ContextUtils.getApplicationContext(), nativeSigninManagerAndroid,
-- accountTrackerService, AndroidSyncSettings.get());
-+ AndroidSyncSettings.get());
+ assert identityManager != null;
+ assert identityMutator != null;
+- return new SigninManager(nativeSigninManagerAndroid, accountTrackerService, identityManager,
++ return new SigninManager(nativeSigninManagerAndroid, identityManager,
+ identityMutator, AndroidSyncSettings.get());
}
@VisibleForTesting
- SigninManager(Context context, long nativeSigninManagerAndroid,
-- AccountTrackerService accountTrackerService, AndroidSyncSettings androidSyncSettings) {
-+ AndroidSyncSettings androidSyncSettings) {
+- SigninManager(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService,
++ SigninManager(long nativeSigninManagerAndroid,
+ IdentityManager identityManager, IdentityMutator identityMutator,
+ AndroidSyncSettings androidSyncSettings) {
ThreadUtils.assertOnUiThread();
- assert context != null;
assert androidSyncSettings != null;
- mContext = context;
mNativeSigninManagerAndroid = nativeSigninManagerAndroid;
- mAccountTrackerService = accountTrackerService;
+ mIdentityManager = identityManager;
+ mIdentityMutator = identityMutator;
mAndroidSyncSettings = androidSyncSettings;
-
+@@ -230,7 +224,6 @@ public class SigninManager
mSigninAllowedByPolicy =
SigninManagerJni.get().isSigninAllowedByPolicy(mNativeSigninManagerAndroid);
--
+
- mAccountTrackerService.addSystemAccountsSeededListener(this);
+ mIdentityManager.addObserver(this);
}
- /**
-@@ -249,7 +241,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
- */
+@@ -241,7 +234,6 @@ public class SigninManager
@CalledByNative
public void destroy() {
+ mIdentityManager.removeObserver(this);
- mAccountTrackerService.removeSystemAccountsSeededListener(this);
mNativeSigninManagerAndroid = 0;
}
-@@ -286,8 +277,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+@@ -285,8 +277,7 @@ public class SigninManager
* Returns true if signin can be started now.
*/
public boolean isSignInAllowed() {
@@ -611,10 +616,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
}
/**
-@@ -344,27 +334,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+@@ -342,27 +333,6 @@ public class SigninManager
+ });
}
- /**
+- /**
- * Continue pending sign in after system accounts have been seeded into AccountTrackerService.
- */
- @Override
@@ -635,11 +641,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
- }
- }
-
-- /**
+ /**
* Starts the sign-in flow, and executes the callback when finished.
*
- * If an activity is provided, it is considered an "interactive" sign-in and the user can be
-@@ -419,16 +388,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+@@ -418,14 +388,8 @@ public class SigninManager
}
private void progressSignInFlowSeedSystemAccounts() {
@@ -648,21 +653,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
- } else if (AccountIdProvider.getInstance().canBeUsed()) {
- mSignInState.mBlockedOnAccountSeeding = true;
- } else {
-- Activity activity = mSignInState.mActivity;
-- handleGooglePlayServicesUnavailability(activity, !isForceSigninEnabled());
- Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
- abortSignIn();
- }
-+ mSignInState.mBlockedOnAccountSeeding = true;
++ Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
++ abortSignIn();
}
/**
-@@ -462,18 +422,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+@@ -459,18 +423,6 @@ public class SigninManager
// This method should be called at most once per sign-in flow.
- assert mSignInState != null;
+ assert mSignInState != null && mSignInState.mCoreAccountInfo != null;
-- if (!SigninManagerJni.get().setPrimaryAccount(
-- mNativeSigninManagerAndroid, mSignInState.mAccount.name)) {
+- if (!mIdentityMutator.setPrimaryAccount(mSignInState.mCoreAccountInfo.getId())) {
- Log.w(TAG, "Failed to set the PrimaryAccount in IdentityManager, aborting signin");
- abortSignIn();
- return;
@@ -670,24 +673,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
-
- // Cache the signed-in account name. This must be done after the native call, otherwise
- // sync tries to start without being signed in natively and crashes.
-- ChromeSigninController.get().setSignedInAccountName(mSignInState.mAccount.name);
-- enableSync(mSignInState.mAccount);
+- ChromeSigninController.get().setSignedInAccountName(
+- mSignInState.mCoreAccountInfo.getName());
+- enableSync(mSignInState.mCoreAccountInfo.getAccount());
-
if (mSignInState.mCallback != null) {
mSignInState.mCallback.onSignInComplete();
}
-@@ -640,10 +588,8 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+@@ -620,10 +572,8 @@ public class SigninManager
// Native sign-out must happen before resetting the account so data is deleted correctly.
// http://crbug.com/589028
- ChromeSigninController.get().setSignedInAccountName(null);
- if (mSignOutState.mWipeDataHooks != null) mSignOutState.mWipeDataHooks.preWipeData();
- disableSyncAndWipeData(mSignOutState.mShouldWipeUserData, this::onProfileDataWiped);
+ if (mSignOutState.mSignOutCallback != null) mSignOutState.mSignOutCallback.preWipeData();
+ disableSyncAndWipeData(mSignOutState.mShouldWipeUserData, this::finishSignOut);
- mAccountTrackerService.invalidateAccountSeedStatus(true);
}
- @VisibleForTesting
-@@ -719,13 +665,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+ void finishSignOut() {
+@@ -683,13 +633,6 @@ public class SigninManager
SigninManagerJni.get().stopApplyingCloudPolicy(mNativeSigninManagerAndroid);
}
@@ -704,7 +708,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninMa
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
-@@ -345,24 +345,12 @@ CHAR-LIMIT guidelines:
+@@ -339,24 +339,12 @@ CHAR-LIMIT guidelines:
@@ -729,7 +733,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
Disabled by the administrator of this device
-@@ -412,9 +400,6 @@ CHAR-LIMIT guidelines:
+@@ -406,9 +394,6 @@ CHAR-LIMIT guidelines:
Sends URLs of pages you visit to Google
@@ -739,7 +743,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
Cancel sync?
-@@ -1282,9 +1267,6 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1265,9 +1250,6 @@ Your Google account may have other forms of browsing history like searches and a
When Lite mode is on, Chrome uses Google servers to make pages load faster. Lite mode rewrites very slow pages to load only essential content. Lite mode does not apply to Incognito tabs.
@@ -752,16 +756,14 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
-@@ -145,8 +145,7 @@ SigninManagerAndroid::SigninManagerAndroid(
- g_browser_process->local_state());
+@@ -138,7 +138,6 @@ SigninManagerAndroid::SigninManagerAndroid(
java_signin_manager_ = Java_SigninManager_create(
-- base::android::AttachCurrentThread(), reinterpret_cast(this),
-- identity_manager_->LegacyGetAccountTrackerServiceJavaObject());
-+ base::android::AttachCurrentThread(), reinterpret_cast(this));
+ base::android::AttachCurrentThread(), reinterpret_cast(this),
+- identity_manager_->LegacyGetAccountTrackerServiceJavaObject(),
+ identity_manager_->GetJavaObject(),
+ identity_manager_->GetIdentityMutatorJavaObject());
}
-
- base::android::ScopedJavaLocalRef
diff --git a/components/invalidation/impl/invalidation_service_util.cc b/components/invalidation/impl/invalidation_service_util.cc
--- a/components/invalidation/impl/invalidation_service_util.cc
+++ b/components/invalidation/impl/invalidation_service_util.cc
@@ -875,7 +877,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
diff --git a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
--- a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
+++ b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
-@@ -212,13 +212,7 @@ public class AndroidSyncSettings {
+@@ -213,13 +213,7 @@ public class AndroidSyncSettings {
private void setChromeSyncEnabled(boolean value) {
synchronized (mLock) {
@@ -890,7 +892,7 @@ diff --git a/components/sync/android/java/src/org/chromium/components/sync/Andro
}
notifyObservers();
}
-@@ -299,19 +293,9 @@ public class AndroidSyncSettings {
+@@ -300,19 +294,9 @@ public class AndroidSyncSettings {
boolean oldChromeSyncEnabled = mChromeSyncEnabled;
boolean oldMasterSyncEnabled = mMasterSyncEnabled;
@@ -916,7 +918,7 @@ diff --git a/components/sync/android/java/src/org/chromium/components/sync/Andro
diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
--- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
+++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
-@@ -96,50 +96,7 @@ public class HttpNegotiateAuthenticator {
+@@ -97,54 +97,8 @@ public class HttpNegotiateAuthenticator {
@Override
public void run(AccountManagerFuture future) {
@@ -925,7 +927,8 @@ diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.ja
- accounts = future.getResult();
- } catch (OperationCanceledException | AuthenticatorException | IOException e) {
- Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to retrieve accounts.", e);
-- nativeSetResult(mRequestData.nativeResultObject, NetError.ERR_UNEXPECTED, null);
+- HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
+- HttpNegotiateAuthenticator.this, NetError.ERR_UNEXPECTED, null);
- return;
- }
-
@@ -933,8 +936,9 @@ diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.ja
- Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: No account provided for the kerberos "
- + "authentication. Please verify the configuration policies and "
- + "that the CONTACTS runtime permission is granted. ");
-- nativeSetResult(mRequestData.nativeResultObject,
-- NetError.ERR_MISSING_AUTH_CREDENTIALS, null);
+- HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
+- HttpNegotiateAuthenticator.this, NetError.ERR_MISSING_AUTH_CREDENTIALS,
+- null);
- return;
- }
-
@@ -943,8 +947,9 @@ diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.ja
- + "kerberos authentication. Please fix the configuration by "
- + "providing a single account.",
- accounts.length);
-- nativeSetResult(mRequestData.nativeResultObject,
-- NetError.ERR_MISSING_AUTH_CREDENTIALS, null);
+- HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
+- HttpNegotiateAuthenticator.this, NetError.ERR_MISSING_AUTH_CREDENTIALS,
+- null);
- return;
- }
-
@@ -955,7 +960,8 @@ diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.ja
- // API >= 23 USE_CREDENTIALS permission is removed
- Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: USE_CREDENTIALS permission not "
- + "granted. Aborting authentication.");
-- nativeSetResult(mRequestData.nativeResultObject,
+- HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
+- HttpNegotiateAuthenticator.this,
- NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
- return;
- }
@@ -965,10 +971,11 @@ diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.ja
- new GetTokenCallback(mRequestData),
- new Handler(ThreadUtils.getUiThreadLooper()));
+ // account-based authentication removed for privacy-violations concerns
++ return;
}
}
-@@ -152,41 +109,7 @@ public class HttpNegotiateAuthenticator {
+@@ -157,42 +111,8 @@ public class HttpNegotiateAuthenticator {
@Override
public void run(AccountManagerFuture future) {
@@ -977,7 +984,8 @@ diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.ja
- result = future.getResult();
- } catch (OperationCanceledException | AuthenticatorException | IOException e) {
- Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to obtain a token.", e);
-- nativeSetResult(mRequestData.nativeResultObject, NetError.ERR_UNEXPECTED, null);
+- HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
+- HttpNegotiateAuthenticator.this, NetError.ERR_UNEXPECTED, null);
- return;
- }
-
@@ -1007,69 +1015,15 @@ diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.ja
- } else {
- processResult(result, mRequestData);
- }
-+ // ditto
++ // account-based authentication removed for privacy-violations concerns
++ return;
}
}
-@@ -300,22 +223,7 @@ public class HttpNegotiateAuthenticator {
- */
- private void requestTokenWithoutActivity(
- Context ctx, RequestData requestData, String[] features) {
-- if (lacksPermission(ctx, Manifest.permission.GET_ACCOUNTS, true /* onlyPreM */)) {
-- // Protecting the AccountManager#getAccountsByTypeAndFeatures call.
-- // API < 23 Requires the GET_ACCOUNTS permission or throws an exception.
-- // API >= 23 Requires the GET_ACCOUNTS permission (CONTACTS permission group) or
-- // returns only the accounts whose authenticator has a signature that
-- // matches our app. Working with this restriction and not requesting
-- // the permission is a valid use case in the context of WebView, so we
-- // don't require it on M+
-- Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: GET_ACCOUNTS permission not "
-- + "granted. Aborting authentication.");
-- nativeSetResult(requestData.nativeResultObject,
-- NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
-- return;
-- }
-- requestData.accountManager.getAccountsByTypeAndFeatures(mAccountType, features,
-- new GetAccountsCallback(requestData), new Handler(ThreadUtils.getUiThreadLooper()));
-+ // ditto
- }
-
- /**
-@@ -334,29 +242,7 @@ public class HttpNegotiateAuthenticator {
- */
- private void requestTokenWithActivity(
- Context ctx, Activity activity, RequestData requestData, String[] features) {
-- boolean isPreM = Build.VERSION.SDK_INT < Build.VERSION_CODES.M;
-- String permission = isPreM
-- ? "android.permission.MANAGE_ACCOUNTS"
-- : Manifest.permission.GET_ACCOUNTS;
--
-- // Check if the AccountManager#getAuthTokenByFeatures call can be made.
-- // API < 23 Requires the MANAGE_ACCOUNTS permission.
-- // API >= 23 Requires the GET_ACCOUNTS permission to behave properly. When it's not granted,
-- // accounts not managed by the current application can't be retrieved. Depending
-- // on the authenticator implementation, it might prompt to create an account, but
-- // that won't be saved. This would be a bad user experience, so we also consider
-- // it a failure case.
-- if (lacksPermission(ctx, permission, isPreM)) {
-- Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: %s permission not granted. "
-- + "Aborting authentication", permission);
-- nativeSetResult(requestData.nativeResultObject,
-- NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
-- return;
-- }
--
-- requestData.accountManager.getAuthTokenByFeatures(mAccountType, requestData.authTokenType,
-- features, activity, null, requestData.options, new GetTokenCallback(requestData),
-- new Handler(ThreadUtils.getUiThreadLooper()));
-+ // ditto
- }
-
- /**
diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
--- a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
+++ b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
-@@ -92,7 +92,6 @@ public class OAuthTokenFetcher {
+@@ -93,7 +93,6 @@ public class OAuthTokenFetcher {
/** Begins fetching a token. Should be called on the main thread. */
public void fetch() {
@@ -1077,7 +1031,7 @@ diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFe
}
/**
-@@ -101,7 +100,6 @@ public class OAuthTokenFetcher {
+@@ -102,7 +101,6 @@ public class OAuthTokenFetcher {
* @param expiredToken A previously-fetched token which has expired.
*/
public void clearAndFetch(String expiredToken) {
@@ -1086,5 +1040,5 @@ diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFe
private void fetchImpl(final String expiredToken) {
--
-2.11.0
+2.17.1
diff --git a/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch b/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch
index baf843aa..51c896b0 100644
--- a/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch
+++ b/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch
@@ -9,7 +9,7 @@ Subject: Replace DoH probe domain with RIPE domain
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
-@@ -816,7 +816,7 @@ class DnsTCPAttempt : public DnsAttempt {
+@@ -818,7 +818,7 @@ class DnsTCPAttempt : public DnsAttempt {
// ----------------------------------------------------------------------------
@@ -19,5 +19,5 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
const net::BackoffEntry::Policy kProbeBackoffPolicy = {
// Apply exponential backoff rules after the first error.
--
-2.11.0
+2.17.1
diff --git a/build/patches/Restore-classic-new-tab-page.patch b/build/patches/Restore-classic-new-tab-page.patch
index 04aa34a2..2a4688eb 100644
--- a/build/patches/Restore-classic-new-tab-page.patch
+++ b/build/patches/Restore-classic-new-tab-page.patch
@@ -34,5 +34,5 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
const TemplateURL* template_url =
GetDefaultSearchProviderTemplateURL(profile);
--
-2.11.0
+2.17.1
diff --git a/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch b/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch
index 0c4d6a3b..6de8c683 100644
--- a/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch
+++ b/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch
@@ -4,31 +4,31 @@ Subject: Revert "Cleanup Search Ready Omnibox flag since it has launched"
This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2.
---
- .../java/src/org/chromium/chrome/browser/ChromeFeatureList.java | 1 +
- .../chrome/browser/omnibox/suggestions/AutocompleteMediator.java | 7 +++++++
- chrome/browser/about_flags.cc | 3 +++
- chrome/browser/android/chrome_feature_list.cc | 4 ++++
- chrome/browser/android/chrome_feature_list.h | 1 +
- chrome/browser/flag-metadata.json | 5 +++++
- chrome/browser/flag_descriptions.cc | 5 +++++
- chrome/browser/flag_descriptions.h | 3 +++
+ .../src/org/chromium/chrome/browser/ChromeFeatureList.java | 1 +
+ .../browser/omnibox/suggestions/AutocompleteMediator.java | 7 +++++++
+ chrome/browser/about_flags.cc | 3 +++
+ chrome/browser/android/chrome_feature_list.cc | 4 ++++
+ chrome/browser/android/chrome_feature_list.h | 1 +
+ chrome/browser/flag-metadata.json | 5 +++++
+ chrome/browser/flag_descriptions.cc | 5 +++++
+ chrome/browser/flag_descriptions.h | 3 +++
8 files changed, 29 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
@@ -303,6 +303,7 @@ public abstract class ChromeFeatureList {
+ public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts";
+ public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler";
+ public static final String READER_MODE_IN_CCT = "ReaderModeInCCT";
++ public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
public static final String REMOVE_NAVIGATION_HISTORY = "RemoveNavigationHistory";
public static final String REORDER_BOOKMARKS = "ReorderBookmarks";
public static final String REVAMPED_CONTEXT_MENU = "RevampedContextMenu";
-+ public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
- public static final String SEND_TAB_TO_SELF = "SyncSendTabToSelf";
- public static final String SERVICE_MANAGER_FOR_DOWNLOAD = "ServiceManagerForDownload";
- public static final String SERVICE_WORKER_PAYMENT_APPS = "ServiceWorkerPaymentApps";
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
-@@ -321,6 +321,13 @@ class AutocompleteMediator
+@@ -364,6 +364,13 @@ class AutocompleteMediator
void onNativeInitialized() {
mNativeInitialized = true;
@@ -45,30 +45,30 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest
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
-@@ -1966,6 +1966,9 @@ const FeatureEntry kFeatureEntries[] = {
- {"enable-homepage-tile", flag_descriptions::kHomepageTileName,
- flag_descriptions::kHomepageTileDescription, kOsAndroid,
- FEATURE_VALUE_TYPE(chrome::android::kHomepageTile)},
+@@ -1972,6 +1972,9 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kAndroidAutofillAccessibilityName,
+ flag_descriptions::kAndroidAutofillAccessibilityDescription, kOsAndroid,
+ FEATURE_VALUE_TYPE(features::kAndroidAutofillAccessibility)},
+ {"enable-search-ready-omnibox", flag_descriptions::kSearchReadyOmniboxName,
+ flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid,
+ FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
- {"enable-bookmark-reorder", flag_descriptions::kReorderBookmarksName,
- flag_descriptions::kReorderBookmarksDescription, kOsAndroid,
- FEATURE_VALUE_TYPE(chrome::android::kReorderBookmarks)},
+ #endif // OS_ANDROID
+ {"enable-zero-copy", flag_descriptions::kZeroCopyName,
+ flag_descriptions::kZeroCopyDescription, kOsAll,
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
@@ -164,6 +164,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
- &kReaderModeInCCT,
&kReorderBookmarks,
&kRevampedContextMenu,
+ &kScrollToExpandPaymentHandler,
+ &kSearchReadyOmniboxFeature,
&kSearchEnginePromoExistingDevice,
&kSearchEnginePromoNewDevice,
&kServiceManagerForBackgroundPrefetch,
-@@ -516,6 +517,9 @@ const base::Feature kReorderBookmarks{"ReorderBookmarks",
- const base::Feature kRevampedContextMenu{"RevampedContextMenu",
- base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -516,6 +517,9 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu",
+ const base::Feature kScrollToExpandPaymentHandler{
+ "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kSearchReadyOmniboxFeature{
+ "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -79,8 +79,8 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
--- a/chrome/browser/android/chrome_feature_list.h
+++ b/chrome/browser/android/chrome_feature_list.h
-@@ -101,6 +101,7 @@ extern const base::Feature kReaderModeInCCT;
- extern const base::Feature kRevampedContextMenu;
+@@ -101,6 +101,7 @@ extern const base::Feature kRevampedContextMenu;
+ extern const base::Feature kScrollToExpandPaymentHandler;
extern const base::Feature kSearchEnginePromoExistingDevice;
extern const base::Feature kSearchEnginePromoNewDevice;
+extern const base::Feature kSearchReadyOmniboxFeature;
@@ -90,22 +90,22 @@ diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/andro
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
-@@ -1626,6 +1626,11 @@
+@@ -1647,6 +1647,11 @@
+ "owners": [ "ginko", "newcomer" ],
"expiry_milestone": 78
},
- {
++ {
+ "name": "enable-search-ready-omnibox",
+ "owners": [ "mdjones" ],
+ "expiry_milestone": -1
+ },
-+ {
+ {
"name": "enable-send-tab-to-self",
"owners": [ "//components/send_tab_to_self/OWNERS" ],
- "expiry_milestone": 77
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
-@@ -2695,6 +2695,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] =
+@@ -2764,6 +2764,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] =
"process to check the Safe Browsing reputation of URLs without calling "
"into GmsCore for every URL.";
@@ -120,7 +120,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1594,6 +1594,9 @@ extern const char kReaderModeInCCTDescription[];
+@@ -1626,6 +1626,9 @@ extern const char kReaderModeInCCTDescription[];
extern const char kSafeBrowsingUseLocalBlacklistsV2Name[];
extern const char kSafeBrowsingUseLocalBlacklistsV2Description[];
@@ -131,5 +131,5 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
extern const char kSetMarketUrlForTestingDescription[];
--
-2.11.0
+2.17.1
diff --git a/build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch b/build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch
index 66a5fe5d..ada62142 100644
--- a/build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch
+++ b/build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch
@@ -23,7 +23,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
-@@ -417,7 +417,7 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
+@@ -453,7 +453,7 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
@@ -33,5 +33,5 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
// Prevents using SurfaceLayer for videos. This is meant to be used by embedders
// that cannot support SurfaceLayer at the moment.
--
-2.11.0
+2.17.1
diff --git a/build/patches/Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch b/build/patches/Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
deleted file mode 100644
index 60224130..00000000
--- a/build/patches/Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 26 Sep 2019 00:00:43 +0200
-Subject: Revert "Remove UnifiedConsent from ChromeFeatureList"
-
-This reverts commit c513d4c926a42ba6cc5eccfd5e85ba64c38bf0c1.
----
- .../android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
-@@ -339,6 +339,7 @@ public abstract class ChromeFeatureList {
- public static final String TRUSTED_WEB_ACTIVITY_NOTIFICATION_DELEGATION_ENROLMENT =
- "TrustedWebActivityNotificationDelegationAutoEnrolment";
- public static final String VIDEO_PERSISTENCE = "VideoPersistence";
-+ public static final String UNIFIED_CONSENT = "UnifiedConsent";
- public static final String USAGE_STATS = "UsageStats";
- public static final String VR_BROWSING_FEEDBACK = "VrBrowsingFeedback";
- public static final String USER_ACTIVATION_V2 = "UserActivationV2";
---
-2.11.0
-
diff --git a/build/patches/Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch b/build/patches/Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
index 0595ca4f..cd368074 100644
--- a/build/patches/Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
+++ b/build/patches/Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
@@ -8,74 +8,75 @@ This reverts commit c672a0683e89eba3554e2562156b3c8532136f21.
Restore translations
Restore contextual search preference toggle
---
- .../android/java/res/xml/privacy_preferences.xml | 30 ++++
- .../preferences/privacy/PrivacyPreferences.java | 157 +++++++++++++++++++--
- .../preferences/sync/SyncPreferenceUtils.java | 5 +-
- .../browser/sync/SyncNotificationController.java | 17 ++-
- .../java/strings/android_chrome_strings.grd | 15 ++
- .../translations/android_chrome_strings_am.xtb | 19 ++-
- .../translations/android_chrome_strings_ar.xtb | 19 ++-
- .../translations/android_chrome_strings_bg.xtb | 19 ++-
- .../translations/android_chrome_strings_bn.xtb | 19 ++-
- .../translations/android_chrome_strings_ca.xtb | 19 ++-
- .../translations/android_chrome_strings_cs.xtb | 19 ++-
- .../translations/android_chrome_strings_da.xtb | 19 ++-
- .../translations/android_chrome_strings_de.xtb | 19 ++-
- .../translations/android_chrome_strings_el.xtb | 19 ++-
- .../translations/android_chrome_strings_en-GB.xtb | 19 ++-
- .../translations/android_chrome_strings_es-419.xtb | 19 ++-
- .../translations/android_chrome_strings_es.xtb | 19 ++-
- .../translations/android_chrome_strings_et.xtb | 19 ++-
- .../translations/android_chrome_strings_fa.xtb | 19 ++-
- .../translations/android_chrome_strings_fi.xtb | 19 ++-
- .../translations/android_chrome_strings_fil.xtb | 19 ++-
- .../translations/android_chrome_strings_fr.xtb | 19 ++-
- .../translations/android_chrome_strings_gu.xtb | 19 ++-
- .../translations/android_chrome_strings_hi.xtb | 19 ++-
- .../translations/android_chrome_strings_hr.xtb | 19 ++-
- .../translations/android_chrome_strings_hu.xtb | 19 ++-
- .../translations/android_chrome_strings_id.xtb | 19 ++-
- .../translations/android_chrome_strings_it.xtb | 19 ++-
- .../translations/android_chrome_strings_iw.xtb | 19 ++-
- .../translations/android_chrome_strings_ja.xtb | 19 ++-
- .../translations/android_chrome_strings_kn.xtb | 19 ++-
- .../translations/android_chrome_strings_ko.xtb | 19 ++-
- .../translations/android_chrome_strings_lt.xtb | 19 ++-
- .../translations/android_chrome_strings_lv.xtb | 19 ++-
- .../translations/android_chrome_strings_ml.xtb | 19 ++-
- .../translations/android_chrome_strings_mr.xtb | 19 ++-
- .../translations/android_chrome_strings_ms.xtb | 19 ++-
- .../translations/android_chrome_strings_nl.xtb | 19 ++-
- .../translations/android_chrome_strings_no.xtb | 19 ++-
- .../translations/android_chrome_strings_pl.xtb | 19 ++-
- .../translations/android_chrome_strings_pt-BR.xtb | 19 ++-
- .../translations/android_chrome_strings_pt-PT.xtb | 19 ++-
- .../translations/android_chrome_strings_ro.xtb | 19 ++-
- .../translations/android_chrome_strings_ru.xtb | 19 ++-
- .../translations/android_chrome_strings_sk.xtb | 19 ++-
- .../translations/android_chrome_strings_sl.xtb | 19 ++-
- .../translations/android_chrome_strings_sr.xtb | 19 ++-
- .../translations/android_chrome_strings_sv.xtb | 19 ++-
- .../translations/android_chrome_strings_sw.xtb | 19 ++-
- .../translations/android_chrome_strings_ta.xtb | 19 ++-
- .../translations/android_chrome_strings_te.xtb | 19 ++-
- .../translations/android_chrome_strings_th.xtb | 19 ++-
- .../translations/android_chrome_strings_tr.xtb | 19 ++-
- .../translations/android_chrome_strings_uk.xtb | 19 ++-
- .../translations/android_chrome_strings_vi.xtb | 19 ++-
- .../translations/android_chrome_strings_zh-CN.xtb | 19 ++-
- .../translations/android_chrome_strings_zh-TW.xtb | 19 ++-
- .../chromium/chrome/browser/sync/SyncTestRule.java | 9 +-
- .../org/chromium/chrome/browser/sync/UkmTest.java | 50 ++++++-
- 59 files changed, 1198 insertions(+), 73 deletions(-)
+ .../java/res/xml/privacy_preferences.xml | 30 ++++
+ .../privacy/PrivacyPreferences.java | 159 ++++++++++++++++--
+ .../preferences/sync/SyncPreferenceUtils.java | 5 +-
+ .../sync/SyncNotificationController.java | 17 +-
+ .../java/strings/android_chrome_strings.grd | 15 ++
+ .../android_chrome_strings_am.xtb | 19 ++-
+ .../android_chrome_strings_ar.xtb | 19 ++-
+ .../android_chrome_strings_bg.xtb | 19 ++-
+ .../android_chrome_strings_bn.xtb | 19 ++-
+ .../android_chrome_strings_ca.xtb | 19 ++-
+ .../android_chrome_strings_cs.xtb | 19 ++-
+ .../android_chrome_strings_da.xtb | 19 ++-
+ .../android_chrome_strings_de.xtb | 19 ++-
+ .../android_chrome_strings_el.xtb | 19 ++-
+ .../android_chrome_strings_en-GB.xtb | 19 ++-
+ .../android_chrome_strings_es-419.xtb | 19 ++-
+ .../android_chrome_strings_es.xtb | 19 ++-
+ .../android_chrome_strings_et.xtb | 19 ++-
+ .../android_chrome_strings_fa.xtb | 19 ++-
+ .../android_chrome_strings_fi.xtb | 19 ++-
+ .../android_chrome_strings_fil.xtb | 19 ++-
+ .../android_chrome_strings_fr.xtb | 19 ++-
+ .../android_chrome_strings_gu.xtb | 19 ++-
+ .../android_chrome_strings_hi.xtb | 19 ++-
+ .../android_chrome_strings_hr.xtb | 19 ++-
+ .../android_chrome_strings_hu.xtb | 19 ++-
+ .../android_chrome_strings_id.xtb | 19 ++-
+ .../android_chrome_strings_it.xtb | 19 ++-
+ .../android_chrome_strings_iw.xtb | 19 ++-
+ .../android_chrome_strings_ja.xtb | 19 ++-
+ .../android_chrome_strings_kn.xtb | 19 ++-
+ .../android_chrome_strings_ko.xtb | 19 ++-
+ .../android_chrome_strings_lt.xtb | 19 ++-
+ .../android_chrome_strings_lv.xtb | 19 ++-
+ .../android_chrome_strings_ml.xtb | 19 ++-
+ .../android_chrome_strings_mr.xtb | 19 ++-
+ .../android_chrome_strings_ms.xtb | 19 ++-
+ .../android_chrome_strings_nl.xtb | 19 ++-
+ .../android_chrome_strings_no.xtb | 19 ++-
+ .../android_chrome_strings_pl.xtb | 19 ++-
+ .../android_chrome_strings_pt-BR.xtb | 19 ++-
+ .../android_chrome_strings_pt-PT.xtb | 19 ++-
+ .../android_chrome_strings_ro.xtb | 19 ++-
+ .../android_chrome_strings_ru.xtb | 19 ++-
+ .../android_chrome_strings_sk.xtb | 19 ++-
+ .../android_chrome_strings_sl.xtb | 19 ++-
+ .../android_chrome_strings_sr.xtb | 19 ++-
+ .../android_chrome_strings_sv.xtb | 19 ++-
+ .../android_chrome_strings_sw.xtb | 19 ++-
+ .../android_chrome_strings_ta.xtb | 19 ++-
+ .../android_chrome_strings_te.xtb | 19 ++-
+ .../android_chrome_strings_th.xtb | 19 ++-
+ .../android_chrome_strings_tr.xtb | 19 ++-
+ .../android_chrome_strings_uk.xtb | 19 ++-
+ .../android_chrome_strings_vi.xtb | 19 ++-
+ .../android_chrome_strings_zh-CN.xtb | 19 ++-
+ .../android_chrome_strings_zh-TW.xtb | 19 ++-
+ .../chrome/browser/sync/SyncTestRule.java | 9 +-
+ .../chromium/chrome/browser/sync/UkmTest.java | 50 +++++-
+ 59 files changed, 1200 insertions(+), 73 deletions(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -7,6 +7,24 @@
+@@ -6,6 +6,24 @@
+
-
-+
@@ -19,15 +37,27 @@
android:key="usage_stats_reporting"
android:title="@string/usage_stats_setting_title"
@@ -278,15 +278,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
}
return true;
-@@ -99,9 +177,37 @@ public class PrivacyPreferences
+@@ -98,6 +176,36 @@ public class PrivacyPreferences
+ */
public void updateSummaries() {
PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
-
+ PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
+
- CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
- CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
-
++ CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
++ CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
++
+ CheckBoxPreference navigationErrorPref = (CheckBoxPreference) findPreference(
+ PREF_NAVIGATION_ERROR);
+ if (navigationErrorPref != null) {
@@ -312,12 +312,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
+ if (safeBrowsingPref != null) {
+ safeBrowsingPref.setChecked(prefServiceBridge.isSafeBrowsingEnabled());
+ }
-+
+
CheckBoxPreference canMakePaymentPref =
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
- if (canMakePaymentPref != null) {
-@@ -114,6 +220,19 @@ public class PrivacyPreferences
- doNotTrackPref.setSummary(prefServiceBridge.isDoNotTrackEnabled() ? textOn : textOff);
+@@ -112,6 +220,19 @@ public class PrivacyPreferences
+ prefServiceBridge.isDoNotTrackEnabled() ? R.string.text_on : R.string.text_off);
}
+ Preference contextualPref = findPreference(PREF_CONTEXTUAL_SEARCH);
@@ -336,7 +335,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
Preference usageStatsPref = findPreference(PREF_USAGE_STATS);
if (usageStatsPref != null) {
if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {
-@@ -138,6 +257,18 @@ public class PrivacyPreferences
+@@ -136,6 +257,18 @@ public class PrivacyPreferences
return preference -> {
String key = preference.getKey();
PrefServiceBridge prefs = PrefServiceBridge.getInstance();
@@ -358,8 +357,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java
-@@ -119,7 +119,10 @@ public class SyncPreferenceUtils {
- if (profileSyncService.isPassphraseRequiredForDecryption()) {
+@@ -118,7 +118,10 @@ public class SyncPreferenceUtils {
+ if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) {
return res.getString(R.string.sync_need_passphrase);
}
- return context.getString(R.string.sync_and_services_summary_sync_on);
@@ -373,10 +372,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/syn
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
-@@ -6,11 +6,13 @@ package org.chromium.chrome.browser.sync;
-
+@@ -7,11 +7,13 @@ package org.chromium.chrome.browser.sync;
import android.content.Context;
import android.content.Intent;
+ import android.os.Build;
+import android.os.Bundle;
import android.util.Log;
@@ -387,7 +386,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotifi
import org.chromium.chrome.browser.notifications.ChromeNotification;
import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
import org.chromium.chrome.browser.notifications.NotificationBuilderFactory;
-@@ -23,6 +25,7 @@ import org.chromium.chrome.browser.notifications.PendingIntentProvider;
+@@ -24,6 +26,7 @@ import org.chromium.chrome.browser.notifications.PendingIntentProvider;
import org.chromium.chrome.browser.notifications.channels.ChannelDefinitions;
import org.chromium.chrome.browser.preferences.PreferencesLauncher;
import org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences;
@@ -395,7 +394,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotifi
import org.chromium.chrome.browser.sync.GoogleServiceAuthError.State;
import org.chromium.chrome.browser.sync.ui.PassphraseActivity;
import org.chromium.components.sync.AndroidSyncSettings;
-@@ -145,9 +148,17 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
+@@ -154,9 +157,17 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
* @return the intent for opening the settings
*/
private Intent createSettingsIntent() {
@@ -419,7 +418,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotifi
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
-@@ -728,6 +728,18 @@ CHAR-LIMIT guidelines:
+@@ -711,6 +711,18 @@ CHAR-LIMIT guidelines:
Privacy
@@ -438,7 +437,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
Help improve Chrome security
-@@ -1506,6 +1518,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1492,6 +1504,9 @@ Your Google account may have other forms of browsing history like searches and a
Signed in to Google as
@@ -451,7 +450,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_am.xtb b/chrome/android/java/strings/translations/android_chrome_strings_am.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_am.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_am.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
ይህ ለሁሉም ጣቢያዎች ውሂብን ያጸዳል፣ የሚከተሉትን ጨምሮ፦
ሁሉንም ትሮች ይዝጉ
አጠቃላይ
@@ -478,7 +477,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_am.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ar.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ar.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ar.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ar.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
سيؤدي هذا إلى محو بيانات جميع المواقع، بما في ذلك:
إغلاق جميع علامات التبويب
عام
@@ -505,7 +504,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ar.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_bg.xtb b/chrome/android/java/strings/translations/android_chrome_strings_bg.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_bg.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_bg.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
Това действие ще изчисти данните за всички сайтове, включително:
Затваряне на всички раздели
Общи
@@ -532,7 +531,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_bg.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_bn.xtb b/chrome/android/java/strings/translations/android_chrome_strings_bn.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_bn.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_bn.xtb
-@@ -1143,4 +1143,21 @@
+@@ -1117,4 +1117,21 @@
এটা সব সাইটের জন্য ডেটা সাফ করবে, এতে অন্তর্ভুক্ত আছে:
সমস্ত ট্যাবগুলি বন্ধ করুন
সাধারণ
@@ -559,7 +558,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_bn.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ca.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ca.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ca.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ca.xtb
-@@ -1141,4 +1141,21 @@ El lloc web NO obté accés a la càmera. Només tu pots veure les imatges de la
+@@ -1115,4 +1115,21 @@ El lloc web NO obté accés a la càmera. Només tu pots veure les imatges de la
S'esborraran les dades de tots els llocs web, com ara:
Tanca totes les pestanyes
General
@@ -586,7 +585,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ca.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_cs.xtb b/chrome/android/java/strings/translations/android_chrome_strings_cs.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_cs.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_cs.xtb
-@@ -1141,4 +1141,21 @@ Web NEZÍSKÁ přístup k fotoaparátu. Fotky z fotoaparátu uvidíte pouze vy
+@@ -1115,4 +1115,21 @@ Web NEZÍSKÁ přístup k fotoaparátu. Fotky z fotoaparátu uvidíte pouze vy
Tímto vymažete data všech webů včetně těchto:
Zavřít všechny karty
Všeobecné
@@ -613,7 +612,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_cs.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_da.xtb b/chrome/android/java/strings/translations/android_chrome_strings_da.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_da.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_da.xtb
-@@ -1141,4 +1141,21 @@ Websitet får IKKE adgang til kameraet. Kameraets billeder kan kun ses af dig.Denne handling rydder dataene for alle websites, herunder:
Luk alle faner
Generelt
@@ -640,7 +639,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_da.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_de.xtb b/chrome/android/java/strings/translations/android_chrome_strings_de.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_de.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_de.xtb
-@@ -1141,4 +1141,21 @@ Die Website erhält KEINEN Zugriff auf die Kamera. Die Kamerabilder sind nur fü
+@@ -1115,4 +1115,21 @@ Die Website erhält KEINEN Zugriff auf die Kamera. Die Kamerabilder sind nur fü
Alle Daten für alle Websites werden gelöscht, darunter:
Alle Tabs schließen
Allgemein
@@ -667,7 +666,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_de.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_el.xtb b/chrome/android/java/strings/translations/android_chrome_strings_el.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_el.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_el.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
Αυτή η ενέργεια θα εκκαθαρίσει τα δεδομένα για όλους τους ιστότοπους, όπως:
Κλείσιμο όλων των καρτελών
Γενικά
@@ -694,7 +693,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_el.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_en-GB.xtb b/chrome/android/java/strings/translations/android_chrome_strings_en-GB.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_en-GB.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_en-GB.xtb
-@@ -1141,4 +1141,21 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -1115,4 +1115,21 @@ The site does NOT gain access to the camera. The camera images are only visible
This will clear data for all sites, including:
Close all tabs
General
@@ -721,7 +720,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_en-
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_es-419.xtb b/chrome/android/java/strings/translations/android_chrome_strings_es-419.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_es-419.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_es-419.xtb
-@@ -1141,4 +1141,21 @@ El sitio NO podrá acceder a la cámara. Solo tú podrás ver las imágenes de l
+@@ -1115,4 +1115,21 @@ El sitio NO podrá acceder a la cámara. Solo tú podrás ver las imágenes de l
Esta acción borrará los datos de todos los sitios, entre los que se incluyen:
Cerrar todas las pestañas
General
@@ -748,7 +747,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_es-
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_es.xtb b/chrome/android/java/strings/translations/android_chrome_strings_es.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_es.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_es.xtb
-@@ -1141,4 +1141,21 @@ El sitio web no obtendrá acceso a la cámara. Solo tú puedes ver las imágenes
+@@ -1115,4 +1115,21 @@ El sitio web no obtendrá acceso a la cámara. Solo tú puedes ver las imágenes
Se borrarán los datos de todos los sitios web, incluidos:
Cerrar todas las pestañas
General
@@ -775,7 +774,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_es.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_et.xtb b/chrome/android/java/strings/translations/android_chrome_strings_et.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_et.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_et.xtb
-@@ -1141,4 +1141,21 @@ Sait EI saa juurdepääsu kaamerale. Kaamera jäädvustatud pildid on nähtavad
+@@ -1115,4 +1115,21 @@ Sait EI saa juurdepääsu kaamerale. Kaamera jäädvustatud pildid on nähtavad
See kustutab kõikide saitide andmed, sealhulgas:
Sule kõik vahelehed
Üldine
@@ -802,7 +801,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_et.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_fa.xtb b/chrome/android/java/strings/translations/android_chrome_strings_fa.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_fa.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_fa.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
با این کار دادههای همه سایتها پاک میشود، از جمله:
بستن همه برگهها
موارد کلی
@@ -829,7 +828,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_fa.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_fi.xtb b/chrome/android/java/strings/translations/android_chrome_strings_fi.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_fi.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_fi.xtb
-@@ -1141,4 +1141,21 @@ Sivusto EI saa kameran käyttöoikeutta. Kamerakuvat näkyvät vain sinulle.Kaikkien sivustojen tiedot poistetaan, esimerkiksi:
Sulje kaikki välilehdet
Yleistä
@@ -856,7 +855,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_fi.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_fil.xtb b/chrome/android/java/strings/translations/android_chrome_strings_fil.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_fil.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_fil.xtb
-@@ -1141,4 +1141,21 @@ HINDI magkakaroon ng access sa camera ang site. Ikaw lang ang makakakita ng mga
+@@ -1115,4 +1115,21 @@ HINDI magkakaroon ng access sa camera ang site. Ikaw lang ang makakakita ng mga
Iki-clear nito ang data para sa lahat ng site, kabilang ang:
Isara ang lahat ng tab
Pangkalahatan
@@ -883,7 +882,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_fil
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_fr.xtb b/chrome/android/java/strings/translations/android_chrome_strings_fr.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_fr.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_fr.xtb
-@@ -1141,4 +1141,21 @@ En revanche, le site n'a PAS accès à la caméra. Vous seul pouvez voir les ima
+@@ -1115,4 +1115,21 @@ En revanche, le site n'a PAS accès à la caméra. Vous seul pouvez voir les ima
Cette action entraînera la suppression des données pour tous les sites, y compris :
Fermer tous les onglets
Général
@@ -910,7 +909,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_fr.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_gu.xtb b/chrome/android/java/strings/translations/android_chrome_strings_gu.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_gu.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_gu.xtb
-@@ -1141,4 +1141,21 @@ VR મોડમાં દાખલ થતા પહેલા ખાતરી ક
+@@ -1115,4 +1115,21 @@ VR મોડમાં દાખલ થતા પહેલા ખાતરી ક
આ બધી સાઇટ્સ પરથી ડેટા સાફ કરશે, આ સહિત:
બધા ટેબ્સ બંધ કરો
સામાન્ય
@@ -937,7 +936,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_gu.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_hi.xtb b/chrome/android/java/strings/translations/android_chrome_strings_hi.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_hi.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_hi.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
इससे इन सभी साइटों का डेटा साफ़ हो जाएगा:
सभी टैब बंद करें
सामान्य
@@ -964,7 +963,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_hi.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_hr.xtb b/chrome/android/java/strings/translations/android_chrome_strings_hr.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_hr.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_hr.xtb
-@@ -1141,4 +1141,21 @@ Web-lokacija NE dobiva pristup fotoaparatu. Slike fotoaparata možete vidjeti sa
+@@ -1115,4 +1115,21 @@ Web-lokacija NE dobiva pristup fotoaparatu. Slike fotoaparata možete vidjeti sa
Izbrisat će se podaci za sve web-lokacije, uključujući:
Zatvori sve kartice
Općenito
@@ -991,7 +990,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_hr.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_hu.xtb b/chrome/android/java/strings/translations/android_chrome_strings_hu.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_hu.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_hu.xtb
-@@ -1141,4 +1141,21 @@ A webhely NEM kap hozzáférést a kamerához. A kamera képét csak Ön láthat
+@@ -1115,4 +1115,21 @@ A webhely NEM kap hozzáférést a kamerához. A kamera képét csak Ön láthat
Ezzel törli az összes webhely adatait, beleértve a következőket:
Az összes lap bezárása
Általános
@@ -1018,7 +1017,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_hu.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_id.xtb b/chrome/android/java/strings/translations/android_chrome_strings_id.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_id.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_id.xtb
-@@ -1141,4 +1141,21 @@ Situs TIDAK mendapatkan akses ke kamera. Gambar kamera hanya dapat dilihat oleh
+@@ -1115,4 +1115,21 @@ Situs TIDAK mendapatkan akses ke kamera. Gambar kamera hanya dapat dilihat oleh
Tindakan ini akan menghapus data untuk semua situs, termasuk:
Tutup semua tab
Umum
@@ -1045,7 +1044,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_id.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_it.xtb b/chrome/android/java/strings/translations/android_chrome_strings_it.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_it.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_it.xtb
-@@ -1141,4 +1141,21 @@ Il sito NON ottiene l'accesso alla videocamera. Le immagini della videocamera so
+@@ -1115,4 +1115,21 @@ Il sito NON ottiene l'accesso alla videocamera. Le immagini della videocamera so
Questa operazione cancellerà i dati di tutti i siti, inclusi:
Chiudi tutte le schede
Generali
@@ -1072,7 +1071,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_it.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_iw.xtb b/chrome/android/java/strings/translations/android_chrome_strings_iw.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_iw.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_iw.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
פעולה זו תמחק נתונים של כל האתרים, כולל:
סגור את כל הכרטיסיות
כללי
@@ -1099,7 +1098,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_iw.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ja.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ja.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ja.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ja.xtb
-@@ -1141,4 +1141,21 @@ VR を開始する前に、信頼できるサイトかどうかを確認して
+@@ -1115,4 +1115,21 @@ VR を開始する前に、信頼できるサイトかどうかを確認して
この操作を行うと、次を含むすべてのサイトのデータが削除されます。
すべてのタブを閉じる
全般
@@ -1126,7 +1125,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ja.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_kn.xtb b/chrome/android/java/strings/translations/android_chrome_strings_kn.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_kn.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_kn.xtb
-@@ -1142,4 +1142,21 @@ VR ಗೆ ಪ್ರವೇಶಿಸುವ ಮೊದಲು ನೀವು ಈ ವೆ
+@@ -1116,4 +1116,21 @@ VR ಗೆ ಪ್ರವೇಶಿಸುವ ಮೊದಲು ನೀವು ಈ ವೆ
ಇದು ಎಲ್ಲಾ ಸೈಟ್ಗಳಿಗೆ ಡೇಟಾ ತೆರವುಗೊಳಿಸುತ್ತದೆ, ಇವುಗಳನ್ನೂ ಒಳಗೊಂಡು:
ಎಲ್ಲ ಟ್ಯಾಬ್ಗಳನ್ನು ಮುಚ್ಚಿ
ಸಾಮಾನ್ಯ
@@ -1153,7 +1152,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_kn.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ko.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ko.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ko.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ko.xtb
-@@ -1141,4 +1141,21 @@ VR로 들어가기 전에 이 사이트를 신뢰할 수 있는지 확인하세
+@@ -1115,4 +1115,21 @@ VR로 들어가기 전에 이 사이트를 신뢰할 수 있는지 확인하세
다음을 포함한 모든 사이트의 데이터가 삭제됩니다.
탭 모두 닫기
일반
@@ -1180,7 +1179,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ko.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_lt.xtb b/chrome/android/java/strings/translations/android_chrome_strings_lt.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_lt.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_lt.xtb
-@@ -1141,4 +1141,21 @@ Svetainė NETURI prieigos prie fotoaparato. Fotoaparato vaizdai matomi tik jums.
+@@ -1115,4 +1115,21 @@ Svetainė NETURI prieigos prie fotoaparato. Fotoaparato vaizdai matomi tik jums.
Bus išvalyti visų svetainių duomenys, įskaitant:
Uždar. visų skirtukų lapus
Bendra
@@ -1207,7 +1206,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_lt.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_lv.xtb b/chrome/android/java/strings/translations/android_chrome_strings_lv.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_lv.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_lv.xtb
-@@ -1141,4 +1141,21 @@ Vietnei NAV piekļuves kamerai. Kameras attēli ir redzami tikai jums.Tādējādi tiks dzēsti dati no visām vietnēm, tostarp:
Aizvērt visas cilnes
Vispārīgi
@@ -1234,7 +1233,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_lv.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ml.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ml.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ml.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ml.xtb
-@@ -1141,4 +1141,21 @@ VR-ൽ പ്രവേശിക്കുന്നതിന് മുമ്പ്
+@@ -1115,4 +1115,21 @@ VR-ൽ പ്രവേശിക്കുന്നതിന് മുമ്പ്
ഇത് ഇനിപ്പറയുന്നവ ഉൾപ്പെടെയുള്ള എല്ലാ സൈറ്റുകളുടെയും വിവരങ്ങൾ മായ്ക്കുന്നതിനിടയാക്കും:
എല്ലാ ടാബുകളും അടയ്ക്കുക
പൊതുവായ
@@ -1261,7 +1260,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ml.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_mr.xtb b/chrome/android/java/strings/translations/android_chrome_strings_mr.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_mr.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_mr.xtb
-@@ -1141,4 +1141,21 @@ VR मध्ये एंटर करण्यापूर्वी तुम
+@@ -1115,4 +1115,21 @@ VR मध्ये एंटर करण्यापूर्वी तुम
हे यासह सर्व साइटसाठी डेटा साफ करेल:
सर्व टॅब बंद करा
सामान्य
@@ -1288,7 +1287,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_mr.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ms.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ms.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ms.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ms.xtb
-@@ -1141,4 +1141,21 @@ Tapak TIDAK memperoleh akses kepada kamera. Hanya anda dapat melihat imej kamera
+@@ -1115,4 +1115,21 @@ Tapak TIDAK memperoleh akses kepada kamera. Hanya anda dapat melihat imej kamera
Ini akan memadamkan data untuk semua tapak web, termasuk:
Tutup semua tab
Umum
@@ -1315,7 +1314,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ms.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_nl.xtb b/chrome/android/java/strings/translations/android_chrome_strings_nl.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_nl.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_nl.xtb
-@@ -1141,4 +1141,21 @@ De site krijgt GEEN toegang tot de camera. De camerabeelden zijn alleen zichtbaa
+@@ -1115,4 +1115,21 @@ De site krijgt GEEN toegang tot de camera. De camerabeelden zijn alleen zichtbaa
Hiermee worden de gegevens voor alle sites gewist, inclusief:
Alle tabbladen sluiten
Algemeen
@@ -1342,7 +1341,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_nl.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_no.xtb b/chrome/android/java/strings/translations/android_chrome_strings_no.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_no.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_no.xtb
-@@ -1141,4 +1141,21 @@ Nettstedet får IKKE tilgang til kameraet. Kamerabildene er kun synlige for deg.
+@@ -1115,4 +1115,21 @@ Nettstedet får IKKE tilgang til kameraet. Kamerabildene er kun synlige for deg.
Dette fører til at dataene for alle nettsteder slettes, deriblant disse:
Lukk alle faner
Generelt
@@ -1369,7 +1368,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_no.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_pl.xtb b/chrome/android/java/strings/translations/android_chrome_strings_pl.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_pl.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_pl.xtb
-@@ -1141,4 +1141,21 @@ Witryna NIE uzyskuje dostępu do kamery. Tylko Ty widzisz rejestrowany obraz.Spowoduje to usunięcie danych wszystkich witryn, w tym:
Zamknij wszystkie karty
Ogólne
@@ -1396,7 +1395,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_pl.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_pt-BR.xtb b/chrome/android/java/strings/translations/android_chrome_strings_pt-BR.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_pt-BR.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_pt-BR.xtb
-@@ -1142,4 +1142,21 @@ O site NÃO terá acesso à câmera. As imagens da câmera são visíveis apenas
+@@ -1116,4 +1116,21 @@ O site NÃO terá acesso à câmera. As imagens da câmera são visíveis apenas
Essa ação limpará os dados de todos os sites, incluindo:
Fechar todas as guias
Geral
@@ -1423,7 +1422,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_pt-
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_pt-PT.xtb b/chrome/android/java/strings/translations/android_chrome_strings_pt-PT.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_pt-PT.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_pt-PT.xtb
-@@ -1141,4 +1141,21 @@ O site NÃO fica com acesso à câmara. As imagens da câmara estão visíveis a
+@@ -1115,4 +1115,21 @@ O site NÃO fica com acesso à câmara. As imagens da câmara estão visíveis a
Esta ação limpa os dados de todos os sites, incluindo:
Fechar todos os separadores
Geral
@@ -1450,7 +1449,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_pt-
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ro.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ro.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ro.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ro.xtb
-@@ -1141,4 +1141,21 @@ Acest site NU primește acces la cameră. Imaginile camerei sunt vizibile doar p
+@@ -1115,4 +1115,21 @@ Acest site NU primește acces la cameră. Imaginile camerei sunt vizibile doar p
Astfel, se vor șterge datele pentru toate site-urile, inclusiv:
Închide toate filele
General
@@ -1477,7 +1476,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ro.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ru.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ru.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ru.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ru.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
Будут удалены данные всех сайтов, в том числе:
Закрыть все вкладки
Общие
@@ -1504,7 +1503,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ru.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sk.xtb b/chrome/android/java/strings/translations/android_chrome_strings_sk.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_sk.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_sk.xtb
-@@ -1141,4 +1141,21 @@ Web NEZÍSKA prístup k fotoaparátu. Obrázky fotoaparátu sú viditeľné iba
+@@ -1115,4 +1115,21 @@ Web NEZÍSKA prístup k fotoaparátu. Obrázky fotoaparátu sú viditeľné iba
Vymažete dáta všetkých webov vrátane týchto:
Zavrieť všetky karty
Všeobecné
@@ -1531,7 +1530,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sk.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sl.xtb b/chrome/android/java/strings/translations/android_chrome_strings_sl.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_sl.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_sl.xtb
-@@ -1141,4 +1141,21 @@ Spletno mesto NIMA dostopa do kamere. Posnetki kamere so vidni samo vam.S tem bodo izbrisani podatki za vsa spletna mesta, vključno s temi:
Zapri vse zavihke
Splošno
@@ -1558,7 +1557,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sl.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sr.xtb b/chrome/android/java/strings/translations/android_chrome_strings_sr.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_sr.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_sr.xtb
-@@ -1141,4 +1141,21 @@ Google налог можда има друге облике историје п
+@@ -1115,4 +1115,21 @@ Google налог можда има друге облике историје п
Овим бришете податке за све сајтове, укључујући:
Затвори све картице
Опште
@@ -1585,7 +1584,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sr.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sv.xtb b/chrome/android/java/strings/translations/android_chrome_strings_sv.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_sv.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_sv.xtb
-@@ -1141,4 +1141,21 @@ Webbplatsen får INTE tillgång till kameran. Bara du kan se kamerabilderna.Åtgärden raderar data för alla webbplatser, inklusive:
Stäng alla flikar
Allmänt
@@ -1612,7 +1611,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sv.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sw.xtb b/chrome/android/java/strings/translations/android_chrome_strings_sw.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_sw.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_sw.xtb
-@@ -1139,4 +1139,21 @@ Tovuti hii HAIPATI idhini ya kufikia kamera. Ni wewe pekee utaona picha hizi za
+@@ -1113,4 +1113,21 @@ Tovuti hii HAIPATI idhini ya kufikia kamera. Ni wewe pekee utaona picha hizi za
Hatua hii itafuta data ya tovuti zote, ikiwa ni pamoja na:
Funga vichupo vyote
Jumla
@@ -1639,7 +1638,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_sw.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ta.xtb b/chrome/android/java/strings/translations/android_chrome_strings_ta.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_ta.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_ta.xtb
-@@ -1141,4 +1141,21 @@ VRரைத் தொடங்குவதற்கு முன் இது
+@@ -1115,4 +1115,21 @@ VRரைத் தொடங்குவதற்கு முன் இது
இதனால் எல்லா தளங்களுக்கான தரவும் அழிக்கப்படும், இதில் அடங்குபவை:
எல்லா தாவல்களையும் மூடு
பொது
@@ -1666,7 +1665,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_ta.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_te.xtb b/chrome/android/java/strings/translations/android_chrome_strings_te.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_te.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_te.xtb
-@@ -1141,4 +1141,21 @@ VRలోకి ప్రవేశించడానికి ముందు,
+@@ -1115,4 +1115,21 @@ VRలోకి ప్రవేశించడానికి ముందు,
ఇది వీటితో సహా అన్ని సైట్ల డేటాను తీసివేస్తుంది:
అన్ని ట్యాబ్లను మూసివేయి
సాధారణం
@@ -1693,7 +1692,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_te.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_th.xtb b/chrome/android/java/strings/translations/android_chrome_strings_th.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_th.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_th.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
การดำเนินการนี้จะล้างข้อมูลสำหรับทุกเว็บไซต์ รวมถึง
ปิดแท็บทั้งหมด
ทั่วไป
@@ -1720,7 +1719,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_th.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_tr.xtb b/chrome/android/java/strings/translations/android_chrome_strings_tr.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_tr.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_tr.xtb
-@@ -1141,4 +1141,21 @@ Site kameraya ERİŞMEZ. Kamera görüntülerini yalnızca siz görebilirsiniz.<
+@@ -1115,4 +1115,21 @@ Site kameraya ERİŞMEZ. Kamera görüntülerini yalnızca siz görebilirsiniz.<
Bu işlem, aşağıdakiler de dahil olmak üzere tüm sitelere ilişkin verileri temizleyecek:
Tüm sekmeleri kapat
Genel
@@ -1747,7 +1746,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_tr.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_uk.xtb b/chrome/android/java/strings/translations/android_chrome_strings_uk.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_uk.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_uk.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
Буде видалено дані всіх сайтів, зокрема:
Закрити всі вкладки
Загальне
@@ -1774,7 +1773,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_uk.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_vi.xtb b/chrome/android/java/strings/translations/android_chrome_strings_vi.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_vi.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_vi.xtb
-@@ -1141,4 +1141,21 @@ Trang web này KHÔNG có quyền truy cập vào máy ảnh. Chỉ bạn mới
+@@ -1115,4 +1115,21 @@ Trang web này KHÔNG có quyền truy cập vào máy ảnh. Chỉ bạn mới
Thao tác này sẽ xóa dữ liệu của tất cả các trang web, bao gồm:
Đóng tất cả các tab
Chung
@@ -1801,7 +1800,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_vi.
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/android/java/strings/translations/android_chrome_strings_zh-CN.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_zh-CN.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_zh-CN.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
这会清除所有网站的数据，包括：
关闭所有标签页
常规
@@ -1828,7 +1827,7 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_zh-
diff --git a/chrome/android/java/strings/translations/android_chrome_strings_zh-TW.xtb b/chrome/android/java/strings/translations/android_chrome_strings_zh-TW.xtb
--- a/chrome/android/java/strings/translations/android_chrome_strings_zh-TW.xtb
+++ b/chrome/android/java/strings/translations/android_chrome_strings_zh-TW.xtb
-@@ -1141,4 +1141,21 @@
+@@ -1115,4 +1115,21 @@
這會清除所有網站的資料，包括：
關閉所有分頁
一般
@@ -1855,18 +1854,18 @@ diff --git a/chrome/android/java/strings/translations/android_chrome_strings_zh-
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java
-@@ -16,6 +16,7 @@ import org.junit.runners.model.Statement;
- import org.chromium.chrome.browser.ChromeActivity;
+@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.SyncFirstSetupCompleteSource;
import org.chromium.chrome.browser.autofill.PersonalDataManager;
import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
+import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator;
import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
-@@ -156,8 +157,12 @@ public class SyncTestRule extends ChromeActivityTestRule {
- public void signIn(final Account account) {
- TestThreadUtils.runOnUiThreadBlocking(() -> {
- IdentityServicesProvider.getSigninManager().signIn(account, null, null);
+@@ -174,8 +175,12 @@ public class SyncTestRule extends ChromeActivityTestRule {
+ Assert.fail("Sign-in was aborted");
+ }
+ });
- // Outside of tests, URL-keyed anonymized data collection is enabled by sign-in UI.
- UnifiedConsentServiceBridge.setUrlKeyedAnonymizedDataCollectionEnabled(true);
+ if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
@@ -1895,10 +1894,12 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTe
import org.chromium.components.sync.ModelType;
import org.chromium.content_public.browser.test.util.JavaScriptUtils;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-@@ -134,6 +137,33 @@ public class UkmTest {
+@@ -132,6 +135,33 @@ public class UkmTest {
+ Assert.assertTrue("UKM Enabled:", isUkmEnabled(normalTab));
+ }
- @Test
- @SmallTest
++ @Test
++ @SmallTest
+ @DisableFeatures(ChromeFeatureList.UNIFIED_CONSENT)
+ public void secondaryPassphraseCheck() throws Exception {
+ // Keep in sync with UkmBrowserTest.SecondaryPassphraseCheck in
@@ -1924,11 +1925,9 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTe
+ Assert.assertNotEquals("Client id:", clientId, getUkmClientId(normalTab));
+ }
+
-+ @Test
-+ @SmallTest
+ @Test
+ @SmallTest
public void singleSyncSignoutCheck() throws Exception {
- // Keep in sync with UkmBrowserTest.SingleSyncSignoutCheck in
- // chrome/browser/metrics/ukm_browsertest.cc.
@@ -178,7 +208,23 @@ public class UkmTest {
// Disable Sync for history.
mSyncTestRule.disableDataType(ModelType.TYPED_URLS);
@@ -1956,5 +1955,5 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTe
}
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
index 00d6ea4e..5b77ee85 100644
--- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
+++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch
@@ -13,7 +13,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
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
-@@ -1927,6 +1927,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1997,6 +1997,10 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)},
#endif // OS_MACOSX
#if defined(OS_ANDROID)
@@ -27,22 +27,22 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
-@@ -681,6 +681,11 @@
- "expiry_milestone": 83
+@@ -712,6 +712,11 @@
+ "quickoffice-chrome-eng@google.com" ],
+ "expiry_milestone": 88
},
- {
++ {
+ "name": "disable-pull-to-refresh-effect",
+ // "owners": [ "your-team" ],
+ "expiry_milestone": -1
+ },
-+ {
+ {
// See https://crbug.com/882238.
"name": "disable-pushstate-throttle",
- "owners": [ "arthursonzogni@ch40m1um.qjz9zk", "palmer@ch40m1um.qjz9zk" ],
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
-@@ -2679,6 +2679,10 @@ extern const char kProcessSharingWithStrictSiteInstancesDescription[] =
+@@ -2748,6 +2748,10 @@ extern const char kProcessSharingWithStrictSiteInstancesDescription[] =
"separated like strict site isolation, but process selection puts multiple "
"site instances in a single process.";
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1583,6 +1583,9 @@ extern const char kProcessSharingWithDefaultSiteInstancesDescription[];
+@@ -1615,6 +1615,9 @@ extern const char kProcessSharingWithDefaultSiteInstancesDescription[];
extern const char kProcessSharingWithStrictSiteInstancesName[];
extern const char kProcessSharingWithStrictSiteInstancesDescription[];
@@ -67,5 +67,5 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
extern const char kReaderModeHeuristicsDescription[];
extern const char kReaderModeHeuristicsMarkup[];
--
-2.11.0
+2.17.1
diff --git a/build/patches/Skip-the-first-run-and-metrics.patch b/build/patches/Skip-the-first-run-and-metrics.patch
index 963cf574..14d8a5af 100644
--- a/build/patches/Skip-the-first-run-and-metrics.patch
+++ b/build/patches/Skip-the-first-run-and-metrics.patch
@@ -3,9 +3,9 @@ Date: Sun, 26 Nov 2017 22:51:43 +0100
Subject: Skip the first run and metrics
---
- .../chromium/chrome/browser/firstrun/FirstRunStatus.java | 8 ++++----
- .../chromium/chrome/browser/firstrun/FirstRunUtils.java | 16 ++++++----------
- .../browser/firstrun/ToSAndUMAFirstRunFragment.java | 6 ++++--
+ .../chrome/browser/firstrun/FirstRunStatus.java | 8 ++++----
+ .../chrome/browser/firstrun/FirstRunUtils.java | 16 ++++++----------
+ .../firstrun/ToSAndUMAFirstRunFragment.java | 6 ++++--
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
@@ -30,7 +30,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/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
-@@ -28,16 +28,12 @@ public class FirstRunUtils {
+@@ -37,16 +37,12 @@ public class FirstRunUtils {
// - checkAnyUserHasSeenToS() may be true which needs to sync its state to the prefs.
boolean javaPrefValue = javaPrefs.getBoolean(CACHED_TOS_ACCEPTED_PREF, false);
boolean nativePrefValue = prefsBridge.isFirstRunEulaAccepted();
@@ -78,5 +78,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
Resources resources = getResources();
--
-2.11.0
+2.17.1
diff --git a/build/patches/Switch-to-fstack-protector-strong.patch b/build/patches/Switch-to-fstack-protector-strong.patch
index 96d2d32d..57c8fef2 100644
--- a/build/patches/Switch-to-fstack-protector-strong.patch
+++ b/build/patches/Switch-to-fstack-protector-strong.patch
@@ -16,7 +16,7 @@ higher memory/cache usage but not by the full 2-3%.
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -273,16 +273,12 @@ config("compiler") {
+@@ -288,16 +288,12 @@ config("compiler") {
cflags += [ "-fstack-protector" ]
}
} else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
@@ -35,5 +35,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/Unified-consent-miscellanous-backport-fixes.patch b/build/patches/Unified-consent-miscellanous-backport-fixes.patch
new file mode 100644
index 00000000..723729e0
--- /dev/null
+++ b/build/patches/Unified-consent-miscellanous-backport-fixes.patch
@@ -0,0 +1,95 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 18 Dec 2019 23:54:37 +0100
+Subject: Unified consent miscellanous backport fixes
+
+---
+ .../privacy/PrivacyPreferences.java | 26 -------------------
+ .../sync/SyncNotificationController.java | 12 +++------
+ 2 files changed, 3 insertions(+), 35 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+@@ -10,7 +10,6 @@ import android.support.graphics.drawable.VectorDrawableCompat;
+ import android.support.v7.preference.CheckBoxPreference;
+ import android.support.v7.preference.Preference;
+ import android.support.v7.preference.PreferenceFragmentCompat;
+-import android.support.v7.preference.PreferenceScreen;
+ import android.view.Menu;
+ import android.view.MenuInflater;
+ import android.view.MenuItem;
+@@ -50,13 +49,10 @@ public class PrivacyPreferences
+
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+- PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
+- privacyPrefManager.migrateNetworkPredictionPreferences();
+ PreferenceUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
+ getActivity().setTitle(R.string.prefs_privacy);
+ setHasOptionsMenu(true);
+ PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
+- PreferenceScreen preferenceScreen = getPreferenceScreen();
+
+ mManagedPreferenceDelegate = createManagedPreferenceDelegate();
+
+@@ -70,27 +66,6 @@ public class PrivacyPreferences
+ networkPredictionPref.setOnPreferenceChangeListener(this);
+ networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
+- if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
+- // Remove preferences that were migrated to SyncAndServicesPreferences.
+- preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
+- preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
+-
+- // TODO(https://crbug.com/846376): Update strings in XML after UNIFIED_CONSENT launch.
+- networkPredictionPref.setTitle(R.string.preload_pages_title);
+- networkPredictionPref.setSummary(R.string.preload_pages_summary);
+-
+- // Put networkPredictionPref after canMakePaymentPref by overriding order value.
+- // However, calling setOrder doesn't change existing order if Preference has already
+- // been added to PreferenceGroup. Remove and re-add it to work around this.
+- // TODO(https://crbug.com/846376): Reorder prefs in XML after UNIFIED_CONSENT launch.
+- preferenceScreen.removePreference(networkPredictionPref);
+- networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
+- preferenceScreen.addPreference(networkPredictionPref);
+-
+- updateSummaries();
+- return;
+- }
+-
+ ChromeBaseCheckBoxPreference searchSuggestionsPref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
+ searchSuggestionsPref.setOnPreferenceChangeListener(this);
+@@ -135,7 +110,6 @@ public class PrivacyPreferences
+ */
+ public void updateSummaries() {
+ PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
+- PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
+
+ CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
+ CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java
+@@ -157,15 +157,9 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
+ * @return the intent for opening the settings
+ */
+ private Intent createSettingsIntent() {
+- final String fragmentName;
+- final Bundle fragmentArguments;
+- if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
+- fragmentName = SyncAndServicesPreferences.class.getName();
+- fragmentArguments = SyncAndServicesPreferences.createArguments(false);
+- } else {
+- fragmentName = AccountManagementFragment.class.getName();
+- fragmentArguments = null;
+- }
++ final String fragmentName = AccountManagementFragment.class.getName();
++ final Bundle fragmentArguments = null;
++
+ return PreferencesLauncher.createIntentForSettingsPage(
+ ContextUtils.getApplicationContext(), fragmentName, fragmentArguments);
+ }
+--
+2.17.1
+
diff --git a/build/patches/Use-4-tile-rows-never-show-logo.patch b/build/patches/Use-4-tile-rows-never-show-logo.patch
index a9cd70f4..a43be137 100644
--- a/build/patches/Use-4-tile-rows-never-show-logo.patch
+++ b/build/patches/Use-4-tile-rows-never-show-logo.patch
@@ -3,17 +3,17 @@ Date: Wed, 21 Feb 2018 00:32:09 +0100
Subject: Use 4 tile rows, never show logo
---
- .../java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java | 6 +++---
- .../browser/suggestions/mostvisited/MostVisitedSitesBridge.java | 2 +-
- .../org/chromium/chrome/browser/suggestions/tile/SiteSection.java | 2 +-
- chrome/browser/engagement/important_sites_util.cc | 2 +-
- components/history/core/browser/top_sites_impl.h | 2 +-
+ .../org/chromium/chrome/browser/ntp/NewTabPageLayout.java | 6 +++---
+ .../suggestions/mostvisited/MostVisitedSitesBridge.java | 2 +-
+ .../chrome/browser/suggestions/tile/SiteSection.java | 2 +-
+ chrome/browser/engagement/important_sites_util.cc | 2 +-
+ components/history/core/browser/top_sites_impl.h | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
-@@ -110,7 +110,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -109,7 +109,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
/** Observer for overview mode. */
private EmptyOverviewModeObserver mOverviewObserver;
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
private boolean mSearchProviderIsGoogle;
private boolean mInitialized;
-@@ -538,7 +538,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -523,7 +523,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
&& mInitialized) {
return;
}
@@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
mSearchProviderIsGoogle = isGoogle;
updateTileGridPadding();
-@@ -822,7 +822,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+@@ -787,7 +787,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
}
private static int getMaxTileRows() {
@@ -43,7 +43,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
-@@ -29,7 +29,7 @@ public class MostVisitedSitesBridge
+@@ -24,7 +24,7 @@ public class MostVisitedSitesBridge implements MostVisitedSites {
* Maximum number of tiles that is explicitly supported. UMA relies on this value, so even if
* the UI supports it, getting more can raise unexpected issues.
*/
@@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mos
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
-@@ -115,7 +115,7 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
+@@ -116,7 +116,7 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
ExploreSitesBridge.getVariation())) {
return 1;
}
@@ -89,5 +89,5 @@ diff --git a/components/history/core/browser/top_sites_impl.h b/components/histo
TopSitesImpl(PrefService* pref_service,
HistoryService* history_service,
--
-2.11.0
+2.17.1
diff --git a/build/patches/Use-64-bit-WebView-processes.patch b/build/patches/Use-64-bit-WebView-processes.patch
index 83af4af0..866c9f8d 100644
--- a/build/patches/Use-64-bit-WebView-processes.patch
+++ b/build/patches/Use-64-bit-WebView-processes.patch
@@ -34,5 +34,5 @@ diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/
{# This part is shared between stand-alone WebView and Monochrome #}
{% macro common(manifest_package, webview_lib) %}
--
-2.11.0
+2.17.1
diff --git a/build/patches/Use-dummy-DFM-installer.patch b/build/patches/Use-dummy-DFM-installer.patch
new file mode 100644
index 00000000..36c9a71d
--- /dev/null
+++ b/build/patches/Use-dummy-DFM-installer.patch
@@ -0,0 +1,546 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 15 Dec 2019 19:40:37 +0100
+Subject: Use dummy DFM installer
+
+---
+ .../chrome/browser/ChromeApplication.java | 4 --
+ components/module_installer/android/BUILD.gn | 2 -
+ .../module_installer/engine/FakeEngine.java | 16 +-----
+ .../engine/SplitCompatEngine.java | 49 ++++++++++---------
+ .../engine/SplitCompatEngineFacade.java | 22 ++-------
+ .../module_installer/logger/Logger.java | 16 ++----
+ .../logger/PlayCoreLogger.java | 36 ++------------
+ .../logger/SplitAvailabilityLogger.java | 28 -----------
+ .../logger/SplitInstallStatusLogger.java | 30 +-----------
+ .../module_installer/util/ModuleUtil.java | 5 --
+ .../util/SplitCompatInitializer.java | 6 ---
+ 11 files changed, 39 insertions(+), 175 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
+@@ -121,10 +121,6 @@ public class ChromeApplication extends Application {
+ ChromeBackgroundTaskFactory.setAsDefault();
+ }
+
+- // Write installed modules to crash keys. This needs to be done as early as possible so that
+- // these values are set before any crashes are reported.
+- ModuleUtil.updateCrashKeys();
+-
+ BuildInfo.setFirebaseAppId(FirebaseConfig.getFirebaseAppId());
+
+ if (!ContextUtils.isIsolatedProcess()) {
+diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn
+--- a/components/module_installer/android/BUILD.gn
++++ b/components/module_installer/android/BUILD.gn
+@@ -19,12 +19,10 @@ android_library("module_installer_java") {
+ "java/src/org/chromium/components/module_installer/logger/Logger.java",
+ "java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java",
+ "java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java",
+- "java/src/org/chromium/components/module_installer/logger/SplitInstallFailureLogger.java",
+ "java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java",
+ "java/src/org/chromium/components/module_installer/observer/ActivityObserver.java",
+ "java/src/org/chromium/components/module_installer/observer/ActivityObserverFacade.java",
+ "java/src/org/chromium/components/module_installer/observer/InstallerObserver.java",
+- "java/src/org/chromium/components/module_installer/util/CrashKeyRecorder.java",
+ "java/src/org/chromium/components/module_installer/util/ModuleUtil.java",
+ "java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java",
+ "java/src/org/chromium/components/module_installer/util/Timer.java",
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/FakeEngine.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/FakeEngine.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/FakeEngine.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/FakeEngine.java
+@@ -7,9 +7,6 @@ package org.chromium.components.module_installer.engine;
+ import android.content.Context;
+ import android.content.pm.PackageManager;
+
+-import com.google.android.play.core.splitcompat.SplitCompat;
+-import com.google.android.play.core.splitcompat.ingestion.Verifier;
+-
+ import org.chromium.base.BuildInfo;
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+@@ -124,18 +121,7 @@ class FakeEngine extends SplitCompatEngine {
+ return false;
+ }
+
+- // Check that the module's signature matches Chrome's.
+- try {
+- Verifier verifier = new Verifier(context);
+- if (!verifier.verifySplits()) {
+- return false;
+- }
+- } catch (IOException | PackageManager.NameNotFoundException e) {
+- return false;
+- }
+-
+- // Tell SplitCompat to do a full emulation of the module.
+- return SplitCompat.fullInstall(context);
++ return false;
+ }
+
+ private File joinPaths(String... paths) {
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java
+@@ -6,10 +6,10 @@ package org.chromium.components.module_installer.engine;
+
+ import android.app.Activity;
+
+-import com.google.android.play.core.splitinstall.SplitInstallException;
++/*import com.google.android.play.core.splitinstall.SplitInstallException;
+ import com.google.android.play.core.splitinstall.SplitInstallRequest;
+ import com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener;
+-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
++import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;*/
+
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.base.VisibleForTesting;
+@@ -26,41 +26,42 @@ import java.util.Set;
+ * Install engine that uses Play Core and SplitCompat to install modules.
+ */
+ class SplitCompatEngine implements InstallEngine {
+- private final SplitCompatEngineFacade mFacade;
+- private final SplitInstallStateUpdatedListener mUpdateListener = getStatusUpdateListener();
++/* private final SplitCompatEngineFacade mFacade;
++ private final SplitInstallStateUpdatedListener mUpdateListener = getStatusUpdateListener();*/
+ private static final Map> sSessions = new HashMap<>();
+
+ public SplitCompatEngine() {
+- this(new SplitCompatEngineFacade());
++// this(new SplitCompatEngineFacade());
+ }
+
+- public SplitCompatEngine(SplitCompatEngineFacade facade) {
++/* public SplitCompatEngine(SplitCompatEngineFacade facade) {
+ mFacade = facade;
+ mFacade.initApplicationContext(this);
+- }
++ }*/
+
+ @Override
+ public void initActivity(Activity activity) {
+- mFacade.installActivity(activity);
++// mFacade.installActivity(activity);
+ }
+
+ @Override
+ public boolean isInstalled(String moduleName) {
+- Set installedModules = mFacade.getSplitManager().getInstalledModules();
+- return installedModules.contains(moduleName);
++// Set installedModules = mFacade.getSplitManager().getInstalledModules();
++// return installedModules.contains(moduleName);
++ return false;
+ }
+
+ @Override
+ public void installDeferred(String moduleName) {
+- mFacade.getSplitManager().deferredInstall(Collections.singletonList(moduleName));
+- mFacade.getLogger().logRequestDeferredStart(moduleName);
++// mFacade.getSplitManager().deferredInstall(Collections.singletonList(moduleName));
++// mFacade.getLogger().logRequestDeferredStart(moduleName);
+ }
+
+ @Override
+ public void install(String moduleName, InstallListener listener) {
+ ThreadUtils.assertOnUiThread();
+
+- if (sSessions.containsKey(moduleName)) {
++/* if (sSessions.containsKey(moduleName)) {
+ sSessions.get(moduleName).add(listener);
+ return;
+ }
+@@ -85,10 +86,10 @@ class SplitCompatEngine implements InstallEngine {
+ notifyListeners(moduleName, false);
+ });
+
+- mFacade.getLogger().logRequestStart(moduleName);
++ mFacade.getLogger().logRequestStart(moduleName); */
+ }
+
+- private SplitInstallStateUpdatedListener getStatusUpdateListener() {
++/* private SplitInstallStateUpdatedListener getStatusUpdateListener() {
+ return state -> {
+ if (state.moduleNames().size() != 1) {
+ throw new UnsupportedOperationException("Only one module supported.");
+@@ -109,35 +110,35 @@ class SplitCompatEngine implements InstallEngine {
+
+ mFacade.getLogger().logStatus(moduleName, status);
+ };
+- }
++ }*/
+
+ private void notifyListeners(String moduleName, Boolean success) {
+- for (InstallListener listener : sSessions.get(moduleName)) {
++/* for (InstallListener listener : sSessions.get(moduleName)) {
+ notifyListener(listener, success);
+- }
++ }*/
+
+ sSessions.remove(moduleName);
+ unregisterUpdateListener();
+ }
+
+ protected void notifyListener(InstallListener listener, Boolean success) {
+- if (success) {
++/* if (success) {
+ mFacade.notifyObservers();
+- }
++ }*/
+
+ listener.onComplete(success);
+ }
+
+ private void registerUpdateListener() {
+- if (sSessions.size() == 0) {
++/* if (sSessions.size() == 0) {
+ mFacade.getSplitManager().registerListener(mUpdateListener);
+- }
++ }*/
+ }
+
+ private void unregisterUpdateListener() {
+- if (sSessions.size() == 0) {
++/* if (sSessions.size() == 0) {
+ mFacade.getSplitManager().unregisterListener(mUpdateListener);
+- }
++ }*/
+ }
+
+ @VisibleForTesting
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java
+@@ -6,10 +6,10 @@ package org.chromium.components.module_installer.engine;
+
+ import android.app.Activity;
+
+-import com.google.android.play.core.splitcompat.SplitCompat;
++/*import com.google.android.play.core.splitcompat.SplitCompat;
+ import com.google.android.play.core.splitinstall.SplitInstallManager;
+ import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
+-import com.google.android.play.core.splitinstall.SplitInstallRequest;
++import com.google.android.play.core.splitinstall.SplitInstallRequest;*/
+
+ import org.chromium.base.ApplicationStatus;
+ import org.chromium.base.ContextUtils;
+@@ -26,16 +26,13 @@ import org.chromium.components.module_installer.util.ModuleUtil;
+ class SplitCompatEngineFacade {
+ private InstallerObserver mObserver;
+
+- private final SplitInstallManager mSplitManager;
+ private final Logger mLogger;
+
+ public SplitCompatEngineFacade() {
+- this(SplitInstallManagerFactory.create(ContextUtils.getApplicationContext()),
+- new PlayCoreLogger());
++ this(new PlayCoreLogger());
+ }
+
+- public SplitCompatEngineFacade(SplitInstallManager manager, Logger umaLogger) {
+- mSplitManager = manager;
++ public SplitCompatEngineFacade(Logger umaLogger) {
+ mLogger = umaLogger;
+ }
+
+@@ -43,10 +40,6 @@ class SplitCompatEngineFacade {
+ return mLogger;
+ }
+
+- public SplitInstallManager getSplitManager() {
+- return mSplitManager;
+- }
+-
+ public void initApplicationContext(InstallEngine engine) {
+ ModuleUtil.initApplication();
+
+@@ -57,16 +50,9 @@ class SplitCompatEngineFacade {
+ }
+
+ public void installActivity(Activity activity) {
+- // Note that SplitCompat (install) needs to be called on the Application Context prior
+- // to calling this method - this is guaranteed by the behavior of SplitCompatEngine.
+- SplitCompat.installActivity(activity);
+ }
+
+ public void notifyObservers() {
+ mObserver.onModuleInstalled();
+ }
+-
+- public SplitInstallRequest createSplitInstallRequest(String moduleName) {
+- return SplitInstallRequest.newBuilder().addModule(moduleName).build();
+- }
+ }
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/Logger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/Logger.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/Logger.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/Logger.java
+@@ -4,9 +4,6 @@
+
+ package org.chromium.components.module_installer.logger;
+
+-import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
+-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
+-
+ /**
+ * Logger for SplitCompat Engine.
+ */
+@@ -17,7 +14,7 @@ public interface Logger {
+ * @param moduleName The module name.
+ * @param errorCode The error code.
+ */
+- void logRequestFailure(String moduleName, @SplitInstallErrorCode int errorCode);
++ void logRequestFailure(String moduleName, int errorCode);
+
+ /**
+ * Logs exceptions that happen during the installation process.
+@@ -25,7 +22,7 @@ public interface Logger {
+ * @param moduleName The module name.
+ * @param errorCode The error code.
+ */
+- void logStatusFailure(String moduleName, @SplitInstallErrorCode int errorCode);
++ void logStatusFailure(String moduleName, int errorCode);
+
+ /**
+ * Logs the status count and duration during a module installation process.
+@@ -33,7 +30,7 @@ public interface Logger {
+ * @param moduleName The module name
+ * @param status The status code
+ */
+- void logStatus(String moduleName, @SplitInstallSessionStatus int status);
++ void logStatus(String moduleName, int status);
+
+ /**
+ * Logs the request start time.
+@@ -48,11 +45,4 @@ public interface Logger {
+ * @param moduleName The module name.
+ */
+ void logRequestDeferredStart(String moduleName);
+-
+- /**
+- * Gets the error code for an unknown error thrown at module request time.
+- *
+- * @return The error code.
+- */
+- int getUnknownRequestErrorCode();
+ }
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java
+@@ -4,56 +4,35 @@
+
+ package org.chromium.components.module_installer.logger;
+
+-import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
+-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
+-
+ /**
+ * Concrete Logger for SplitCompat Installers (proxy to specific loggers).
+ */
+ public class PlayCoreLogger implements Logger {
+- private final SplitInstallFailureLogger mFailureLogger;
+ private final SplitInstallStatusLogger mStatusLogger;
+ private final SplitAvailabilityLogger mAvailabilityLogger;
+
+ public PlayCoreLogger() {
+- this(new SplitInstallFailureLogger(), new SplitInstallStatusLogger(),
++ this(new SplitInstallStatusLogger(),
+ new SplitAvailabilityLogger());
+ }
+
+- public PlayCoreLogger(SplitInstallFailureLogger failureLogger,
++ public PlayCoreLogger(
+ SplitInstallStatusLogger statusLogger, SplitAvailabilityLogger availabilityLogger) {
+- mFailureLogger = failureLogger;
+ mStatusLogger = statusLogger;
+ mAvailabilityLogger = availabilityLogger;
+ }
+
+ @Override
+- public void logRequestFailure(String moduleName, @SplitInstallErrorCode int errorCode) {
+- mFailureLogger.logRequestFailure(moduleName, errorCode);
++ public void logRequestFailure(String moduleName, int errorCode) {
+ }
+
+ @Override
+- public void logStatusFailure(String moduleName, @SplitInstallErrorCode int errorCode) {
+- mFailureLogger.logStatusFailure(moduleName, errorCode);
++ public void logStatusFailure(String moduleName, int errorCode) {
+ }
+
+ @Override
+- public void logStatus(String moduleName, @SplitInstallSessionStatus int status) {
++ public void logStatus(String moduleName, int status) {
+ mStatusLogger.logStatusChange(moduleName, status);
+-
+- if (status == SplitInstallSessionStatus.INSTALLED) {
+- mAvailabilityLogger.storeModuleInstalled(moduleName, status);
+- mAvailabilityLogger.logInstallTimes(moduleName);
+-
+- // Keep old behavior where we log a 'success' bit with all other failures.
+- mFailureLogger.logStatusSuccess(moduleName);
+- } else if (status == SplitInstallSessionStatus.CANCELED) {
+- // Keep old behavior where we log a 'canceled' bit with all other failures.
+- mFailureLogger.logStatusCanceled(moduleName);
+- } else if (status == SplitInstallSessionStatus.DOWNLOADED) {
+- // Keep old behavior where we log a 'no split compat' bit with all other failures.
+- mFailureLogger.logStatusNoSplitCompat(moduleName);
+- }
+ }
+
+ @Override
+@@ -67,9 +46,4 @@ public class PlayCoreLogger implements Logger {
+ mStatusLogger.logRequestDeferredStart(moduleName);
+ mAvailabilityLogger.storeRequestDeferredStart(moduleName);
+ }
+-
+- @Override
+- public int getUnknownRequestErrorCode() {
+- return SplitInstallFailureLogger.UNKNOWN_REQUEST_ERROR;
+- }
+ }
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java
+@@ -9,10 +9,6 @@ import android.content.SharedPreferences;
+ import android.os.SystemClock;
+ import android.util.SparseLongArray;
+
+-import com.google.android.play.core.splitinstall.SplitInstallManager;
+-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
+-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
+ import org.chromium.base.metrics.RecordHistogram;
+@@ -53,21 +49,6 @@ public class SplitAvailabilityLogger {
+ Set requestedModules = new HashSet<>();
+ requestedModules.addAll(prefs.getStringSet(ONDEMAND_REQ_PREV, new HashSet<>()));
+ requestedModules.addAll(prefs.getStringSet(DEFERRED_REQ_PREV, new HashSet<>()));
+-
+- Context context = ContextUtils.getApplicationContext();
+- SplitInstallManager manager = SplitInstallManagerFactory.create(context);
+- Set installedModules = manager.getInstalledModules();
+-
+- for (String name : requestedModules) {
+- recordAvailabilityStatus(
+- name, installedModules.contains(name) ? INSTALLED_REQUESTED : REQUESTED);
+- }
+-
+- for (String name : installedModules) {
+- if (!requestedModules.contains(name)) {
+- recordAvailabilityStatus(name, INSTALLED_UNREQUESTED);
+- }
+- }
+ }
+
+ private static void recordAvailabilityStatus(String moduleName, int status) {
+@@ -82,14 +63,6 @@ public class SplitAvailabilityLogger {
+ * @param moduleName The module name.
+ */
+ public void logInstallTimes(String moduleName) {
+- recordInstallTime(moduleName, "", SplitInstallSessionStatus.UNKNOWN,
+- SplitInstallSessionStatus.INSTALLED);
+- recordInstallTime(moduleName, ".PendingDownload", SplitInstallSessionStatus.UNKNOWN,
+- SplitInstallSessionStatus.DOWNLOADING);
+- recordInstallTime(moduleName, ".Download", SplitInstallSessionStatus.DOWNLOADING,
+- SplitInstallSessionStatus.INSTALLING);
+- recordInstallTime(moduleName, ".Installing", SplitInstallSessionStatus.INSTALLING,
+- SplitInstallSessionStatus.INSTALLED);
+ }
+
+ /**
+@@ -169,7 +142,6 @@ public class SplitAvailabilityLogger {
+
+ public InstallTimes(boolean isCached) {
+ mIsCached = isCached;
+- mInstallTimes.put(SplitInstallSessionStatus.UNKNOWN, SystemClock.uptimeMillis());
+ }
+ }
+ }
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java
+@@ -4,8 +4,6 @@
+
+ package org.chromium.components.module_installer.logger;
+
+-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
+-
+ import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
+
+ class SplitInstallStatusLogger {
+@@ -28,33 +26,7 @@ class SplitInstallStatusLogger {
+ // Keep this one at the end and increment appropriately when adding new status.
+ private static final int COUNT = 12;
+
+- private int getHistogramCode(@SplitInstallSessionStatus int code) {
+- switch (code) {
+- case SplitInstallSessionStatus.PENDING:
+- return PENDING;
+- case SplitInstallSessionStatus.DOWNLOADING:
+- return DOWNLOADING;
+- case SplitInstallSessionStatus.DOWNLOADED:
+- return DOWNLOADED;
+- case SplitInstallSessionStatus.INSTALLING:
+- return INSTALLING;
+- case SplitInstallSessionStatus.INSTALLED:
+- return INSTALLED;
+- case SplitInstallSessionStatus.FAILED:
+- return FAILED;
+- case SplitInstallSessionStatus.CANCELING:
+- return CANCELING;
+- case SplitInstallSessionStatus.CANCELED:
+- return CANCELED;
+- case SplitInstallSessionStatus.REQUIRES_USER_CONFIRMATION:
+- return REQUIRES_USER_CONFIRMATION;
+- }
+-
+- return UNKNOWN_CODE;
+- }
+-
+- public void logStatusChange(String moduleName, @SplitInstallSessionStatus int status) {
+- recordInstallStatus(moduleName, getHistogramCode(status));
++ public void logStatusChange(String moduleName, int status) {
+ }
+
+ public void logRequestStart(String moduleName) {
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/ModuleUtil.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/ModuleUtil.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/ModuleUtil.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/ModuleUtil.java
+@@ -41,11 +41,6 @@ public class ModuleUtil {
+ * Updates the CrashKey report containing modules currently present.
+ */
+ public static void updateCrashKeys() {
+- if (!BuildConfig.IS_BUNDLE) return;
+-
+- try (Timer timer = new Timer()) {
+- CrashKeyRecorder.updateCrashKeys();
+- }
+ }
+
+ /**
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java
+@@ -4,8 +4,6 @@
+
+ package org.chromium.components.module_installer.util;
+
+-import com.google.android.play.core.splitcompat.SplitCompat;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.StrictModeContext;
+ import org.chromium.base.ThreadUtils;
+@@ -23,10 +21,6 @@ class SplitCompatInitializer {
+ return;
+ }
+
+- // SplitCompat.install may copy modules into Chrome's internal folder or clean them up.
+- try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
+- SplitCompat.install(ContextUtils.getApplicationContext());
+- }
+ sIsInitialized = true;
+ }
+
+--
+2.17.1
+
diff --git a/build/patches/User-Agent-anonymize.patch b/build/patches/User-Agent-anonymize.patch
index 7b91240b..14825331 100644
--- a/build/patches/User-Agent-anonymize.patch
+++ b/build/patches/User-Agent-anonymize.patch
@@ -18,14 +18,14 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v
std::string GetProductNameAndVersionForUserAgent() {
- return "Chrome/" + GetVersionNumber();
+ // latest stable version
-+ return "Chrome/78.0.3904.108";
++ return "Chrome/79.0.3945.79";
}
std::string GetProductName() {
diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
--- a/content/common/user_agent.cc
+++ b/content/common/user_agent.cc
-@@ -83,7 +83,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
+@@ -87,7 +87,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
architecture_token = "; Win64; IA64";
}
#elif defined(OS_ANDROID)
@@ -34,7 +34,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
std::string android_info_str = GetAndroidOSInfo(include_android_build_number);
#elif defined(OS_POSIX) && !defined(OS_MACOSX)
// Should work on any Posix system.
-@@ -155,16 +155,9 @@ std::string BuildUserAgentFromProductAndExtraOSInfo(
+@@ -159,16 +159,9 @@ std::string BuildUserAgentFromProductAndExtraOSInfo(
}
std::string GetAndroidOSInfo(bool include_android_build_number) {
@@ -55,5 +55,5 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
// Append the build ID.
if (base::FeatureList::IsEnabled(kAndroidUserAgentStringContainsBuildId) ||
--
-2.11.0
+2.17.1
diff --git a/build/patches/autofill-disable-autofill-download-manager.patch b/build/patches/autofill-disable-autofill-download-manager.patch
index 25595cf6..cbb6f70c 100644
--- a/build/patches/autofill-disable-autofill-download-manager.patch
+++ b/build/patches/autofill-disable-autofill-download-manager.patch
@@ -4,14 +4,14 @@ Subject: autofill: disable autofill download manager
Disables the autofill download manager (trk:158).
---
- .../core/browser/autofill_download_manager.cc | 60 +++-------------------
- .../autofill/core/browser/autofill_manager.cc | 18 -------
+ .../core/browser/autofill_download_manager.cc | 60 +++----------------
+ .../autofill/core/browser/autofill_manager.cc | 18 ------
2 files changed, 7 insertions(+), 71 deletions(-)
diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
-@@ -63,7 +63,6 @@ constexpr std::pair kAutofillExperimentRanges[] = {
+@@ -65,7 +65,6 @@ constexpr std::pair kAutofillExperimentRanges[] = {
{3314445, 3314448}, {3314854, 3314883},
};
@@ -19,7 +19,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
const size_t kAutofillDownloadManagerMaxFormCacheSize = 16;
const size_t kMaxFieldsPerQueryRequest = 100;
-@@ -519,35 +518,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload,
+@@ -521,35 +520,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload,
return upload_request.SerializeToString(payload);
}
@@ -55,7 +55,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
// Gets HTTP body payload for API POST request.
bool GetAPIBodyPayload(const std::string& payload,
AutofillDownloadManager::RequestType type,
-@@ -771,6 +741,7 @@ size_t AutofillDownloadManager::GetPayloadLength(
+@@ -773,6 +743,7 @@ size_t AutofillDownloadManager::GetPayloadLength(
std::tuple AutofillDownloadManager::GetRequestURLAndMethod(
const FormRequestData& request_data) const {
@@ -63,7 +63,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
std::string method("POST");
std::string query_str;
-@@ -793,35 +764,18 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod(
+@@ -795,35 +766,18 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod(
GURL url = autofill_server_url_
.Resolve(RequestTypeToString(request_data.request_type))
.ReplaceComponents(replacements);
@@ -108,7 +108,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
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
-@@ -180,19 +180,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
+@@ -182,19 +182,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
}
}
@@ -128,7 +128,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
ValuePatternsMetric GetValuePattern(const base::string16& value) {
if (IsUPIVirtualPaymentAddress(value))
return ValuePatternsMetric::kUpiVpa;
-@@ -1478,11 +1465,6 @@ AutofillManager::AutofillManager(
+@@ -1501,11 +1488,6 @@ AutofillManager::AutofillManager(
: std::make_unique(
driver, client_, personal_data_,
credit_card_form_event_logger_.get());
@@ -141,5 +141,5 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/battery_status_service-disable-more-privacy-nightmares.patch b/build/patches/battery_status_service-disable-more-privacy-nightmares.patch
index 55a1a396..40fde786 100644
--- a/build/patches/battery_status_service-disable-more-privacy-nightmares.patch
+++ b/build/patches/battery_status_service-disable-more-privacy-nightmares.patch
@@ -41,5 +41,5 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
return callback_list_.Add(callback);
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/browser-ui-disable-warning-about-missing-API-keys.patch b/build/patches/browser-ui-disable-warning-about-missing-API-keys.patch
index 3275df71..a4f306d5 100644
--- a/build/patches/browser-ui-disable-warning-about-missing-API-keys.patch
+++ b/build/patches/browser-ui-disable-warning-about-missing-API-keys.patch
@@ -19,5 +19,5 @@ diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chr
std::unique_ptr(
new GoogleApiKeysInfoBarDelegate())));
--
-2.11.0
+2.17.1
diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch
index 94a48c35..0a974a7f 100644
--- a/build/patches/build-remove-calling-untrusted-hooks.patch
+++ b/build/patches/build-remove-calling-untrusted-hooks.patch
@@ -5,7 +5,7 @@ Subject: build: remove calling untrusted hooks
Avoid downloading untrusted executables and wasting time with a
sysroot.
---
- DEPS | 121 ++-----------------------------------------------------------------
+ DEPS | 121 ++---------------------------------------------------------
1 file changed, 3 insertions(+), 118 deletions(-)
diff --git a/DEPS b/DEPS
@@ -31,10 +31,11 @@ diff --git a/DEPS b/DEPS
# By default, do not check out WebKit for iOS, as it is not needed unless
# running against ToT WebKit rather than system WebKit. This can be overridden
-@@ -3055,49 +3055,6 @@ hooks = [
+@@ -3141,49 +3141,6 @@ hooks = [
+ 'sync', '--extract',
],
},
- {
+- {
- 'name': 'sysroot_arm',
- 'pattern': '.',
- 'condition': 'checkout_linux and checkout_arm',
@@ -77,11 +78,10 @@ diff --git a/DEPS b/DEPS
- 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
- '--arch=x64'],
- },
-- {
+ {
# Case-insensitivity for the Win SDK. Must run before win_toolchain below.
'name': 'ciopfs_linux',
- 'pattern': '.',
-@@ -3124,43 +3081,6 @@ hooks = [
+@@ -3211,43 +3168,6 @@ hooks = [
'condition': 'checkout_mac',
'action': ['python', 'src/build/mac_toolchain.py'],
},
@@ -125,7 +125,7 @@ diff --git a/DEPS b/DEPS
{
# Mac doesn't use lld so it's not included in the default clang bundle
# there. lld is however needed in win and Fuchsia cross builds, so
-@@ -3220,18 +3140,6 @@ hooks = [
+@@ -3307,18 +3227,6 @@ hooks = [
'-s', 'src/buildtools/mac/clang-format.sha1',
],
},
@@ -144,7 +144,7 @@ diff --git a/DEPS b/DEPS
# Pull rc binaries using checked-in hashes.
{
'name': 'rc_win',
-@@ -3257,29 +3165,6 @@ hooks = [
+@@ -3344,29 +3252,6 @@ hooks = [
'-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
],
},
@@ -175,5 +175,5 @@ diff --git a/DEPS b/DEPS
{
'name': 'orderfiles_win',
--
-2.11.0
+2.17.1
diff --git a/build/patches/disable-AdsBlockedInfoBar.patch b/build/patches/disable-AdsBlockedInfoBar.patch
index a011b5b3..8feaee9b 100644
--- a/build/patches/disable-AdsBlockedInfoBar.patch
+++ b/build/patches/disable-AdsBlockedInfoBar.patch
@@ -3,7 +3,7 @@ Date: Mon, 26 Aug 2019 17:54:28 -0400
Subject: disable AdsBlockedInfoBar
---
- .../browser/subresource_filter/chrome_subresource_filter_client.cc | 5 -----
+ .../subresource_filter/chrome_subresource_filter_client.cc | 5 -----
1 file changed, 5 deletions(-)
diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
@@ -22,5 +22,5 @@ diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.
TabSpecificContentSettings::FromWebContents(web_contents());
content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_ADS);
--
-2.11.0
+2.17.1
diff --git a/build/patches/disable-background-sync-by-default.patch b/build/patches/disable-background-sync-by-default.patch
index 6542a252..a30e15f5 100644
--- a/build/patches/disable-background-sync-by-default.patch
+++ b/build/patches/disable-background-sync-by-default.patch
@@ -3,7 +3,7 @@ Date: Sun, 16 Jun 2019 21:57:26 -0400
Subject: disable background sync by default
---
- components/content_settings/core/browser/content_settings_registry.cc | 2 +-
+ .../content_settings/core/browser/content_settings_registry.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
@@ -19,5 +19,5 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,
--
-2.11.0
+2.17.1
diff --git a/build/patches/disable-payment-support-by-default.patch b/build/patches/disable-payment-support-by-default.patch
index cd610351..ec0a2a2f 100644
--- a/build/patches/disable-payment-support-by-default.patch
+++ b/build/patches/disable-payment-support-by-default.patch
@@ -19,5 +19,5 @@ diff --git a/components/payments/core/payment_prefs.cc b/components/payments/cor
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/disable-sensors-access-site-setting-by-default.patch b/build/patches/disable-sensors-access-site-setting-by-default.patch
index aecf0945..7e5cf030 100644
--- a/build/patches/disable-sensors-access-site-setting-by-default.patch
+++ b/build/patches/disable-sensors-access-site-setting-by-default.patch
@@ -3,13 +3,13 @@ Date: Sun, 16 Jun 2019 15:57:29 -0400
Subject: disable sensors access site setting by default
---
- components/content_settings/core/browser/content_settings_registry.cc | 2 +-
+ .../content_settings/core/browser/content_settings_registry.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -412,7 +412,7 @@ void ContentSettingsRegistry::Init() {
+@@ -413,7 +413,7 @@ void ContentSettingsRegistry::Init() {
// TODO(crbug.com/904439): Update this to "SECURE_ONLY" once
// DeviceOrientationEvents and DeviceMotionEvents are only fired in secure
// contexts.
@@ -19,5 +19,5 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,
--
-2.11.0
+2.17.1
diff --git a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
index ce969d73..0ab39630 100644
--- a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
+++ b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
@@ -32,5 +32,5 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
enum DnsResolveStatus {
RESOLVE_STATUS_DNS_SUCCESS = 0,
--
-2.11.0
+2.17.1
diff --git a/build/patches/first_run-deactivate-autoupdate-globally.patch b/build/patches/first_run-deactivate-autoupdate-globally.patch
index 77ddf425..d40cc07f 100644
--- a/build/patches/first_run-deactivate-autoupdate-globally.patch
+++ b/build/patches/first_run-deactivate-autoupdate-globally.patch
@@ -26,5 +26,5 @@ diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser
if (!extensions_enabled ||
chromeos::ProfileHelper::IsLockScreenAppProfile(profile_)) {
--
-2.11.0
+2.17.1
diff --git a/build/patches/google-cloud-messaging-disable-experiment-status-check.patch b/build/patches/google-cloud-messaging-disable-experiment-status-check.patch
index 45abd6b6..d73a9cc5 100644
--- a/build/patches/google-cloud-messaging-disable-experiment-status-check.patch
+++ b/build/patches/google-cloud-messaging-disable-experiment-status-check.patch
@@ -40,5 +40,5 @@ diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gc
simple_url_loader_ = network::SimpleURLLoader::Create(
std::move(resource_request), traffic_annotation);
--
-2.11.0
+2.17.1
diff --git a/build/patches/kill-Auth.patch b/build/patches/kill-Auth.patch
index a3607242..b71fbb8d 100644
--- a/build/patches/kill-Auth.patch
+++ b/build/patches/kill-Auth.patch
@@ -3,17 +3,17 @@ Date: Fri, 22 Jun 2018 17:06:15 +0200
Subject: kill Auth
---
- .../chrome/browser/signin/SigninHelper.java | 22 +---------
- .../components/signin/AccountIdProvider.java | 9 +---
- .../signin/SystemAccountManagerDelegate.java | 50 ++--------------------
+ .../chrome/browser/signin/SigninHelper.java | 22 +-------
+ .../components/signin/AccountIdProvider.java | 9 +---
+ .../signin/SystemAccountManagerDelegate.java | 50 ++-----------------
3 files changed, 5 insertions(+), 76 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
-@@ -10,10 +10,6 @@ import android.content.Context;
- import android.content.SharedPreferences;
- import android.support.annotation.Nullable;
+@@ -11,10 +11,6 @@ import android.content.SharedPreferences;
+
+ import androidx.annotation.Nullable;
-import com.google.android.gms.auth.AccountChangeEvent;
-import com.google.android.gms.auth.GoogleAuthException;
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHe
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.VisibleForTesting;
-@@ -74,23 +70,7 @@ public class SigninHelper {
+@@ -73,23 +69,7 @@ public class SigninHelper {
@Override
public List getAccountChangeEvents(
Context context, int index, String accountName) {
@@ -157,5 +157,5 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
// No permission is needed on 23+ and Chrome always has MANAGE_ACCOUNTS permission on lower APIs
--
-2.11.0
+2.17.1
diff --git a/build/patches/kill-GCM.patch b/build/patches/kill-GCM.patch
index cd685cc5..8e1798ac 100644
--- a/build/patches/kill-GCM.patch
+++ b/build/patches/kill-GCM.patch
@@ -3,31 +3,28 @@ Date: Fri, 22 Jun 2018 17:11:38 +0200
Subject: kill GCM
---
- chrome/android/BUILD.gn | 1 -
- chrome/android/chrome_java_sources.gni | 6 -
- chrome/android/java/AndroidManifest.xml | 64 -------
- .../chrome/browser/BackgroundSyncLauncher.java | 97 ----------
- .../chrome/browser/ChromeBackgroundService.java | 1 -
- .../ChromeBackgroundTaskFactory.java | 3 -
- .../invalidation/InvalidationController.java | 8 -
- .../browser/ntp/snippets/SnippetsLauncher.java | 44 -----
- .../browser/services/gcm/GCMBackgroundTask.java | 2 +-
- .../gcm/InvalidationGcmUpstreamSender.java | 18 --
- components/background_task_scheduler/BUILD.gn | 1 -
- .../BackgroundTaskSchedulerGcmNetworkManager.java | 206 +--------------------
- components/gcm_driver/android/BUILD.gn | 1 -
- components/gcm_driver/instance_id/android/BUILD.gn | 1 -
- .../gcm_driver/instance_id/InstanceIDBridge.java | 49 +----
- components/sync/android/BUILD.gn | 1 -
- third_party/cacheinvalidation/BUILD.gn | 6 -
- .../client/contrib/MultiplexingGcmListener.java | 91 +--------
- .../android2/channel/AndroidNetworkChannel.java | 6 +-
- 19 files changed, 9 insertions(+), 597 deletions(-)
+ chrome/android/BUILD.gn | 1 -
+ chrome/android/chrome_java_sources.gni | 6 -
+ chrome/android/java/AndroidManifest.xml | 62 ------
+ .../ChromeBackgroundTaskFactory.java | 3 -
+ .../ntp/snippets/SnippetsLauncher.java | 44 ----
+ .../services/gcm/GCMBackgroundTask.java | 2 +-
+ .../gcm/InvalidationGcmUpstreamSender.java | 18 --
+ components/background_task_scheduler/BUILD.gn | 1 -
+ ...kgroundTaskSchedulerGcmNetworkManager.java | 206 +-----------------
+ components/gcm_driver/android/BUILD.gn | 1 -
+ .../gcm_driver/instance_id/android/BUILD.gn | 1 -
+ .../instance_id/InstanceIDBridge.java | 49 +----
+ components/sync/android/BUILD.gn | 1 -
+ third_party/cacheinvalidation/BUILD.gn | 6 -
+ .../contrib/MultiplexingGcmListener.java | 91 +-------
+ .../channel/AndroidNetworkChannel.java | 6 +-
+ 16 files changed, 9 insertions(+), 489 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -378,7 +378,6 @@ android_library("chrome_java") {
+@@ -369,7 +369,6 @@ android_library("chrome_java") {
"//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
"//third_party/android_deps:javax_inject_javax_inject_java",
"//third_party/android_media:android_media_java",
@@ -38,7 +35,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
-@@ -20,7 +20,6 @@ chrome_java_sources = [
+@@ -17,7 +17,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/ChromeActivity.java",
"java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
"java/src/org/chromium/chrome/browser/ChromeApplication.java",
@@ -46,7 +43,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
-@@ -1424,11 +1423,6 @@ chrome_java_sources = [
+@@ -1438,11 +1437,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
"java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
"java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
@@ -61,7 +58,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
-@@ -78,22 +78,17 @@ by a child template that "extends" this file.
+@@ -74,22 +74,17 @@ by a child template that "extends" this file.
@@ -84,7 +81,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
{% block extra_uses_permissions %}
-@@ -1068,49 +1063,8 @@ by a child template that "extends" this file.
+@@ -1019,45 +1014,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
@@ -127,14 +124,10 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
-
-
-
+
--
-
-
@@ -159,152 +152,6 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
-@@ -8,10 +8,6 @@ import android.content.Context;
- import android.content.SharedPreferences;
- import android.os.StrictMode;
-
--import com.google.android.gms.gcm.GcmNetworkManager;
--import com.google.android.gms.gcm.OneoffTask;
--import com.google.android.gms.gcm.Task;
--
- import org.chromium.base.ContextUtils;
- import org.chromium.base.Log;
- import org.chromium.base.VisibleForTesting;
-@@ -37,8 +33,6 @@ public class BackgroundSyncLauncher {
- // BackgroundSyncLauncherAndroid, if any. If it is non-null then the browser is running.
- private static BackgroundSyncLauncher sInstance;
-
-- private GcmNetworkManager mScheduler;
--
- /**
- * Disables the automatic use of the GCMNetworkManager. When disabled, the methods which
- * interact with GCM can still be used, but will not be called automatically on creation, or by
-@@ -123,30 +117,6 @@ public class BackgroundSyncLauncher {
- @VisibleForTesting
- @CalledByNative
- protected void launchBrowserIfStopped(final boolean shouldLaunch, final long minDelayMs) {
-- mLaunchBrowserIfStoppedTask = new AsyncTask() {
-- @Override
-- protected Void doInBackground() {
-- SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
-- prefs.edit()
-- .putBoolean(PREF_BACKGROUND_SYNC_LAUNCH_NEXT_ONLINE, shouldLaunch)
-- .apply();
-- return null;
-- }
-- @Override
-- protected void onPostExecute(Void params) {
-- if (sGCMEnabled) {
-- if (shouldLaunch) {
-- RecordHistogram.recordBooleanHistogram(
-- "BackgroundSync.LaunchTask.ScheduleSuccess",
-- scheduleLaunchTask(mScheduler, minDelayMs));
-- } else {
-- RecordHistogram.recordBooleanHistogram(
-- "BackgroundSync.LaunchTask.CancelSuccess",
-- removeScheduledTasks(mScheduler));
-- }
-- }
-- }
-- }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
- }
-
- /**
-@@ -158,7 +128,6 @@ public class BackgroundSyncLauncher {
- }
-
- protected BackgroundSyncLauncher() {
-- mScheduler = GcmNetworkManager.getInstance(ContextUtils.getApplicationContext());
- launchBrowserIfStopped(false, 0);
- }
-
-@@ -187,72 +156,6 @@ public class BackgroundSyncLauncher {
- return !sGCMEnabled;
- }
-
-- private static boolean scheduleLaunchTask(GcmNetworkManager scheduler, long minDelayMs) {
-- // Google Play Services may not be up to date, if the application was not installed through
-- // the Play Store. In this case, scheduling the task will fail silently.
-- final long minDelaySecs = minDelayMs / 1000;
-- OneoffTask oneoff = new OneoffTask.Builder()
-- .setService(ChromeBackgroundService.class)
-- .setTag(TASK_TAG)
-- // We have to set a non-zero execution window here
-- .setExecutionWindow(minDelaySecs, minDelaySecs + 1)
-- .setRequiredNetwork(Task.NETWORK_STATE_CONNECTED)
-- .setPersisted(true)
-- .setUpdateCurrent(true)
-- .build();
-- try {
-- scheduler.schedule(oneoff);
-- } catch (IllegalArgumentException e) {
-- // Disable GCM for the remainder of this session.
-- setGCMEnabled(false);
-- // Return false so that the failure will be logged.
-- return false;
-- }
-- return true;
-- }
--
-- private static boolean removeScheduledTasks(GcmNetworkManager scheduler) {
-- // Third-party code causes broadcast to touch disk. http://crbug.com/614679
-- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
-- try {
-- scheduler.cancelTask(TASK_TAG, ChromeBackgroundService.class);
-- } catch (IllegalArgumentException e) {
-- // This occurs when BackgroundSyncLauncherService is not found in the application
-- // manifest. This should not happen in code that reaches here, but has been seen in
-- // the past. See https://crbug.com/548314
-- // Disable GCM for the remainder of this session.
-- setGCMEnabled(false);
-- // Return false so that the failure will be logged.
-- return false;
-- } finally {
-- StrictMode.setThreadPolicy(oldPolicy);
-- }
-- return true;
-- }
--
-- /**
-- * Reschedule any required background sync tasks, if they have been removed due to an
-- * application upgrade.
-- *
-- * This method checks the saved preferences, and reschedules the sync tasks as appropriate
-- * to match the preferences.
-- * This method is static so that it can be run without actually instantiating a
-- * BackgroundSyncLauncher.
-- */
-- protected static void rescheduleTasksOnUpgrade(final Context context) {
-- final GcmNetworkManager scheduler = GcmNetworkManager.getInstance(context);
-- BackgroundSyncLauncher.ShouldLaunchCallback callback = shouldLaunch -> {
-- if (shouldLaunch) {
-- // It's unclear what time the sync event was supposed to fire, so fire
-- // without delay and let the browser reschedule if necessary.
-- // TODO(iclelland): If this fails, report the failure via UMA (not now,
-- // since the browser is not running, but on next startup.)
-- scheduleLaunchTask(scheduler, 0);
-- }
-- };
-- BackgroundSyncLauncher.shouldLaunchBrowserIfStopped(callback);
-- }
--
- @VisibleForTesting
- static void setGCMEnabled(boolean enabled) {
- sGCMEnabled = enabled;
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
-@@ -113,7 +113,6 @@ public class ChromeBackgroundService extends GcmTaskService {
-
- @VisibleForTesting
- protected void rescheduleBackgroundSyncTasksOnUpgrade() {
-- BackgroundSyncLauncher.rescheduleTasksOnUpgrade(this);
- }
-
- private void handleSnippetsOnBrowserUpgraded() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
@@ -325,32 +172,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task
case TaskIds.OFFLINE_PAGES_BACKGROUND_JOB_ID:
return new OfflineBackgroundTask();
case TaskIds.OFFLINE_PAGES_PREFETCH_JOB_ID:
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
-@@ -10,8 +10,6 @@ import android.os.Build;
- import android.os.Handler;
- import android.os.SystemClock;
-
--import com.google.ipc.invalidation.ticl.android2.channel.AndroidGcmController;
--
- import org.chromium.base.ApplicationState;
- import org.chromium.base.ApplicationStatus;
- import org.chromium.base.ContextUtils;
-@@ -193,13 +191,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
- * Registers for Google Cloud Messaging (GCM) for Invalidations.
- */
- private void ensureGcmIsInitialized() {
-- if (mGcmInitialized) return;
- mGcmInitialized = true;
-- PostTask.postTask(TaskTraits.BEST_EFFORT_MAY_BLOCK, () -> {
-- boolean useGcmUpstream = true;
-- AndroidGcmController.get(ContextUtils.getApplicationContext())
-- .initializeGcm(useGcmUpstream);
-- });
- }
-
- @VisibleForTesting
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
@@ -447,7 +268,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/Sn
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
-@@ -41,7 +41,7 @@ public class GCMBackgroundTask implements BackgroundTask {
+@@ -42,7 +42,7 @@ public class GCMBackgroundTask implements BackgroundTask {
return false;
}
@@ -459,15 +280,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GC
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
-@@ -13,7 +13,6 @@ import android.support.annotation.MainThread;
- import android.support.annotation.Nullable;
- import android.util.Log;
+@@ -14,7 +14,6 @@ import android.util.Log;
+ import androidx.annotation.MainThread;
+ import androidx.annotation.Nullable;
-import com.google.android.gms.gcm.GoogleCloudMessaging;
import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService;
import org.chromium.base.ContextUtils;
-@@ -26,9 +25,6 @@ import org.chromium.components.signin.OAuth2TokenService;
+@@ -28,9 +27,6 @@ import org.chromium.components.signin.OAuth2TokenService;
import org.chromium.components.sync.SyncConstants;
import org.chromium.content_public.browser.UiThreadTaskTraits;
@@ -477,7 +298,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In
/**
* Sends Upstream messages for Invalidations using GCM.
*/
-@@ -87,20 +83,6 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
+@@ -92,20 +88,6 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
* This function runs on a thread pool executor thread.
*/
private void sendUpstreamMessage(String to, Bundle data, String token, Context context) {
@@ -512,9 +333,9 @@ diff --git a/components/background_task_scheduler/BUILD.gn b/components/backgrou
diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
-@@ -8,14 +8,6 @@ import android.content.Context;
- import android.os.Bundle;
- import android.support.annotation.NonNull;
+@@ -9,14 +9,6 @@ import android.os.Bundle;
+
+ import androidx.annotation.NonNull;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
@@ -527,7 +348,7 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting;
-@@ -42,212 +34,16 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+@@ -43,212 +35,16 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
sClock = clock;
}
@@ -744,18 +565,18 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/android/BUILD.gn
--- a/components/gcm_driver/android/BUILD.gn
+++ b/components/gcm_driver/android/BUILD.gn
-@@ -14,7 +14,6 @@ android_library("gcm_driver_java") {
- deps = [
+@@ -15,7 +15,6 @@ android_library("gcm_driver_java") {
"//base:base_java",
+ "//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_sdk:android_gcm_java",
"//third_party/jsr-305:jsr_305_javalib",
]
-
+ annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
--- a/components/gcm_driver/instance_id/android/BUILD.gn
+++ b/components/gcm_driver/instance_id/android/BUILD.gn
-@@ -28,7 +28,6 @@ android_library("instance_id_driver_java") {
+@@ -31,7 +31,6 @@ android_library("instance_id_driver_java") {
java_files = [
"java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java",
@@ -766,7 +587,7 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm
diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
--- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
+++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
-@@ -28,7 +28,6 @@ public class InstanceIDBridge {
+@@ -29,7 +29,6 @@ public class InstanceIDBridge {
* Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be
* initialized on a background thread.
*/
@@ -774,7 +595,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
private static boolean sBlockOnAsyncTasksForTesting;
-@@ -73,7 +72,7 @@ public class InstanceIDBridge {
+@@ -74,7 +73,7 @@ public class InstanceIDBridge {
new BridgeAsyncTask() {
@Override
protected String doBackgroundWork() {
@@ -783,7 +604,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(String id) {
-@@ -88,7 +87,7 @@ public class InstanceIDBridge {
+@@ -90,7 +89,7 @@ public class InstanceIDBridge {
new BridgeAsyncTask() {
@Override
protected Long doBackgroundWork() {
@@ -792,7 +613,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(Long creationTime) {
-@@ -113,21 +112,7 @@ public class InstanceIDBridge {
+@@ -116,21 +115,7 @@ public class InstanceIDBridge {
new BridgeAsyncTask() {
@Override
protected String doBackgroundWork() {
@@ -815,7 +636,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(String token) {
-@@ -143,21 +128,7 @@ public class InstanceIDBridge {
+@@ -147,21 +132,7 @@ public class InstanceIDBridge {
new BridgeAsyncTask() {
@Override
protected Boolean doBackgroundWork() {
@@ -838,7 +659,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(Boolean success) {
-@@ -172,12 +143,7 @@ public class InstanceIDBridge {
+@@ -177,12 +148,7 @@ public class InstanceIDBridge {
new BridgeAsyncTask() {
@Override
protected Boolean doBackgroundWork() {
@@ -852,7 +673,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(Boolean success) {
-@@ -216,11 +182,6 @@ public class InstanceIDBridge {
+@@ -212,11 +178,6 @@ public class InstanceIDBridge {
@Override
@SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native.
protected Result doInBackground() {
@@ -867,10 +688,10 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
diff --git a/components/sync/android/BUILD.gn b/components/sync/android/BUILD.gn
--- a/components/sync/android/BUILD.gn
+++ b/components/sync/android/BUILD.gn
-@@ -11,7 +11,6 @@ android_library("sync_java") {
+@@ -12,7 +12,6 @@ android_library("sync_java") {
"//components/signin/core/browser/android:java",
"//net/android:net_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_sdk:android_gcm_java",
"//third_party/cacheinvalidation:cacheinvalidation_javalib",
"//third_party/cacheinvalidation:cacheinvalidation_proto_java",
@@ -922,10 +743,11 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
/* This class is public so that it can be instantiated by the Android runtime. */
/** Constants used in broadcast Intents. */
-@@ -106,18 +103,6 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
+@@ -105,18 +102,6 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
+ public static final String EXTRA_DATA_NUM_DELETED_MSGS = PREFIX + "NUM_DELETED_MSGS";
}
- /**
+- /**
- * {@link GCMBroadcastReceiver} that forwards GCM intents to the {@code MultiplexingGcmListener}
- * class.
- */
@@ -937,10 +759,9 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
- }
- }
-
-- /**
+ /**
* Convenience base class for client implementations. It provides base classes for a broadcast
* receiver and an intent service that work together to handle events from the
- * {@code MultiplexingGcmListener} while holding a wake lock.
@@ -260,80 +245,6 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
/** Logger. */
private static final Logger logger = AndroidLogger.forTag("MplexGcmListener");
@@ -1051,5 +872,5 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
}
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/kill-Location-fall-back-to-system.patch b/build/patches/kill-Location-fall-back-to-system.patch
index 9ecec2cb..d3908002 100644
--- a/build/patches/kill-Location-fall-back-to-system.patch
+++ b/build/patches/kill-Location-fall-back-to-system.patch
@@ -3,14 +3,14 @@ Date: Fri, 22 Jun 2018 17:05:17 +0200
Subject: kill Location, fall back to system
---
- services/device/geolocation/BUILD.gn | 1 -
- .../chromium/device/geolocation/LocationProviderFactory.java | 10 ++--------
+ services/device/geolocation/BUILD.gn | 1 -
+ .../device/geolocation/LocationProviderFactory.java | 10 ++--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
--- a/services/device/geolocation/BUILD.gn
+++ b/services/device/geolocation/BUILD.gn
-@@ -136,7 +136,6 @@ if (is_android) {
+@@ -145,7 +145,6 @@ if (is_android) {
"android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java",
"android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java",
"android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java",
@@ -44,5 +44,5 @@ diff --git a/services/device/geolocation/android/java/src/org/chromium/device/ge
}
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/kill-TOS-and-metrics-opt-out.patch b/build/patches/kill-TOS-and-metrics-opt-out.patch
index 86540b4f..16ad164b 100644
--- a/build/patches/kill-TOS-and-metrics-opt-out.patch
+++ b/build/patches/kill-TOS-and-metrics-opt-out.patch
@@ -3,9 +3,9 @@ Date: Fri, 22 Jun 2018 17:16:07 +0200
Subject: kill TOS and metrics opt-out
---
- chrome/android/java/res/layout/fre_tosanduma.xml | 2 +-
- chrome/android/java/res/values/dimens.xml | 1 -
- .../src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java | 2 +-
+ chrome/android/java/res/layout/fre_tosanduma.xml | 2 +-
+ chrome/android/java/res/values/dimens.xml | 1 -
+ .../chromium/chrome/browser/firstrun/FirstRunActivityBase.java | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
@@ -23,7 +23,7 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
-@@ -197,7 +197,6 @@
+@@ -194,7 +194,6 @@
12dp
24dp
120dp
@@ -44,5 +44,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
private boolean mNativeInitialized;
--
-2.11.0
+2.17.1
diff --git a/build/patches/kill-Translate.patch b/build/patches/kill-Translate.patch
index 31a56612..00ebba91 100644
--- a/build/patches/kill-Translate.patch
+++ b/build/patches/kill-Translate.patch
@@ -3,13 +3,13 @@ Date: Fri, 22 Jun 2018 17:16:43 +0200
Subject: kill Translate
---
- .../src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java | 3 +++
+ .../org/chromium/chrome/browser/firstrun/FirstRunActivity.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.datareduction.DataReductionProxyUma;
+@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.datareduction.DataReductionProxyUma;
import org.chromium.chrome.browser.metrics.UmaUtils;
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -17,7 +17,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
import org.chromium.ui.base.LocalizationUtils;
-@@ -137,6 +138,8 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -138,6 +139,8 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
if (mPostNativePageSequenceCreated) return;
mFirstRunFlowSequencer.onNativeInitialized(mFreProperties);
@@ -27,5 +27,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
// An optional Data Saver page.
if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
--
-2.11.0
+2.17.1
diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch
index 54c2c390..2dc8cd96 100644
--- a/build/patches/kill-Vision.patch
+++ b/build/patches/kill-Vision.patch
@@ -4,10 +4,10 @@ Subject: kill Vision
Barcode, face and text detection APIs
---
- services/shape_detection/BUILD.gn | 6 ------
- .../java/src/org/chromium/shape_detection/BitmapUtils.java | 12 ------------
- .../chromium/shape_detection/FaceDetectionProviderImpl.java | 13 +------------
- .../org/chromium/shape_detection/InterfaceRegistrar.java | 13 -------------
+ services/shape_detection/BUILD.gn | 6 ------
+ .../org/chromium/shape_detection/BitmapUtils.java | 12 ------------
+ .../shape_detection/FaceDetectionProviderImpl.java | 13 +------------
+ .../shape_detection/InterfaceRegistrar.java | 13 -------------
4 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
@@ -124,5 +124,5 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
}
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch b/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch
index 0e60b9f0..ba2f9594 100644
--- a/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch
+++ b/build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch
@@ -21,5 +21,5 @@ diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc
// Certificates made by CreateKeyAndSelfSignedCert will be signed using this
// digest algorithm.
--
-2.11.0
+2.17.1
diff --git a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch
index 5be30da0..9fe5d9f2 100644
--- a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch
+++ b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch
@@ -5,14 +5,14 @@ Subject: openH264: enable ARM/ARM64 optimizations
Enable the optimizations not only for ChromeOS but for all compatbile ARM/ARM64 architectures
Limit threads auto-detect only for iOS
---
- .../renderer/modules/mediarecorder/h264_encoder.cc | 6 ++---
- third_party/openh264/BUILD.gn | 31 +++++++++++++++++-----
+ .../modules/mediarecorder/h264_encoder.cc | 6 ++--
+ third_party/openh264/BUILD.gn | 31 ++++++++++++++-----
2 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
--- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
+++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
-@@ -152,11 +152,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
+@@ -155,11 +155,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
init_params.iRCMode = RC_OFF_MODE;
}
@@ -94,5 +94,5 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
include_dirs = openh264_encoder_include_dirs
--
-2.11.0
+2.17.1
diff --git a/build/patches/prefs-always-prompt-for-download-directory-by-default.patch b/build/patches/prefs-always-prompt-for-download-directory-by-default.patch
index 79246e05..6797266e 100644
--- a/build/patches/prefs-always-prompt-for-download-directory-by-default.patch
+++ b/build/patches/prefs-always-prompt-for-download-directory-by-default.patch
@@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily.
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
-@@ -239,7 +239,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -243,7 +243,7 @@ void DownloadPrefs::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kPromptForDownload,
@@ -39,5 +39,5 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download
registry->RegisterStringPref(prefs::kDownloadExtensionsToOpen, std::string());
registry->RegisterBooleanPref(prefs::kDownloadDirUpgraded, false);
--
-2.11.0
+2.17.1
diff --git a/build/patches/prefs-disable-signinallowed-by-default.patch b/build/patches/prefs-disable-signinallowed-by-default.patch
index c2e71ca6..cb72b5c7 100644
--- a/build/patches/prefs-disable-signinallowed-by-default.patch
+++ b/build/patches/prefs-disable-signinallowed-by-default.patch
@@ -3,21 +3,21 @@ Date: Fri, 9 Nov 2018 11:59:50 +0100
Subject: prefs: disable signinallowed by default
---
- components/signin/internal/identity_manager/primary_account_manager.cc | 2 +-
+ .../signin/internal/identity_manager/primary_account_manager.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
--- a/components/signin/internal/identity_manager/primary_account_manager.cc
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
-@@ -58,7 +58,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
- std::string());
+@@ -56,7 +56,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
+ registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false);
registry->RegisterBooleanPref(prefs::kAutologinEnabled, true);
registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList);
- registry->RegisterBooleanPref(prefs::kSigninAllowed, true);
+ registry->RegisterBooleanPref(prefs::kSigninAllowed, false);
registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false);
+ }
- // Deprecated prefs: will be removed in a future release.
--
-2.11.0
+2.17.1
diff --git a/build/patches/prefs-only-keep-cookies-until-exit.patch b/build/patches/prefs-only-keep-cookies-until-exit.patch
index 39104278..d5aee614 100644
--- a/build/patches/prefs-only-keep-cookies-until-exit.patch
+++ b/build/patches/prefs-only-keep-cookies-until-exit.patch
@@ -4,7 +4,7 @@ Subject: prefs: only keep cookies until exit
Out with all those tracking cookies!
---
- components/content_settings/core/browser/content_settings_registry.cc | 2 +-
+ .../content_settings/core/browser/content_settings_registry.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
@@ -20,5 +20,5 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
--
-2.11.0
+2.17.1
diff --git a/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch b/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch
index f60e7d77..116230ce 100644
--- a/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch
+++ b/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch
@@ -26,5 +26,5 @@ diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/b
GURL GetClientReportUrl(const std::string& report_url) {
GURL url(report_url);
--
-2.11.0
+2.17.1
diff --git a/build/patches/promo-disable-Google-promotion-fetching.patch b/build/patches/promo-disable-Google-promotion-fetching.patch
index a6d81788..24d3478e 100644
--- a/build/patches/promo-disable-Google-promotion-fetching.patch
+++ b/build/patches/promo-disable-Google-promotion-fetching.patch
@@ -31,5 +31,5 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/safe_browsing-disable-cookie-transmission.patch b/build/patches/safe_browsing-disable-cookie-transmission.patch
index 61720e51..cb8665d6 100644
--- a/build/patches/safe_browsing-disable-cookie-transmission.patch
+++ b/build/patches/safe_browsing-disable-cookie-transmission.patch
@@ -7,11 +7,11 @@ prevents the long-living tracking cookie from being set.
References: https://github.com/iridium-browser/iridium-browser/issues/37
---
- chrome/browser/safe_browsing/client_side_detection_service.cc | 4 ++--
- .../download_protection/check_client_download_request_base.cc | 2 +-
- .../safe_browsing/download_protection/ppapi_download_request.cc | 2 +-
- components/safe_browsing/browser/threat_details_cache.cc | 1 +
- components/safe_browsing/db/v4_update_protocol_manager.cc | 4 ++--
+ chrome/browser/safe_browsing/client_side_detection_service.cc | 4 ++--
+ .../download_protection/check_client_download_request_base.cc | 2 +-
+ .../download_protection/ppapi_download_request.cc | 2 +-
+ components/safe_browsing/browser/threat_details_cache.cc | 1 +
+ components/safe_browsing/db/v4_update_protocol_manager.cc | 4 ++--
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
-@@ -596,7 +596,7 @@ void CheckClientDownloadRequestBase::SendRequest() {
+@@ -610,7 +610,7 @@ void CheckClientDownloadRequestBase::SendRequest() {
auto resource_request = std::make_unique();
resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl();
resource_request->method = "POST";
@@ -73,7 +73,7 @@ diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/componen
diff --git a/components/safe_browsing/db/v4_update_protocol_manager.cc b/components/safe_browsing/db/v4_update_protocol_manager.cc
--- a/components/safe_browsing/db/v4_update_protocol_manager.cc
+++ b/components/safe_browsing/db/v4_update_protocol_manager.cc
-@@ -369,8 +369,8 @@ void V4UpdateProtocolManager::IssueUpdateRequest() {
+@@ -340,8 +340,8 @@ void V4UpdateProtocolManager::IssueUpdateRequest() {
std::string req_base64 = GetBase64SerializedUpdateRequestProto();
GetUpdateUrlAndHeaders(req_base64, &resource_request->url,
&resource_request->headers);
@@ -85,5 +85,5 @@ diff --git a/components/safe_browsing/db/v4_update_protocol_manager.cc b/compone
traffic_annotation);
loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
--
-2.11.0
+2.17.1
diff --git a/build/patches/safe_browsing-disable-incident-reporting.patch b/build/patches/safe_browsing-disable-incident-reporting.patch
index e859953f..23bac26b 100644
--- a/build/patches/safe_browsing-disable-incident-reporting.patch
+++ b/build/patches/safe_browsing-disable-incident-reporting.patch
@@ -6,11 +6,11 @@ Disables the safebrowsing incident reporting where you could upload
information about a blocked URL to Google (also added a trk prefix to
the URL so we get notified if this happens again in the future).
---
- .../safe_browsing/incident_reporting/incident_report_uploader_impl.cc | 2 +-
- .../safe_browsing/incident_reporting/incident_reporting_service.cc | 3 +++
- chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 3 +--
- chrome/browser/safe_browsing/safe_browsing_service.cc | 2 ++
- components/security_interstitials/core/safe_browsing_loud_error_ui.cc | 1 +
+ .../incident_reporting/incident_report_uploader_impl.cc | 2 +-
+ .../incident_reporting/incident_reporting_service.cc | 3 +++
+ chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 3 +--
+ chrome/browser/safe_browsing/safe_browsing_service.cc | 2 ++
+ .../security_interstitials/core/safe_browsing_loud_error_ui.cc | 1 +
5 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_upl
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -312,11 +312,14 @@ IncidentReportingService::UploadContext::~UploadContext() {
+@@ -311,11 +311,14 @@ IncidentReportingService::UploadContext::~UploadContext() {
// static
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrom
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
-@@ -229,8 +229,10 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
+@@ -233,8 +233,10 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
void SafeBrowsingService::RegisterAllDelayedAnalysis() {
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -82,5 +82,5 @@ diff --git a/components/security_interstitials/core/safe_browsing_loud_error_ui.
// Constants for the V4 phishing string upgrades.
--
-2.11.0
+2.17.1
diff --git a/build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch b/build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch
index 55553cd8..4cb8a339 100644
--- a/build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch
+++ b/build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch
@@ -6,7 +6,7 @@ Disables reporting of the safebrowsing override, i.e. the report sent
if a user decides to visit a page that was flagged as "insecure".
This prevents trk:148 (phishing) and trk:149 (malware).
---
- .../browser/safe_browsing/client_side_detection_service.cc | 12 ++++++++++++
+ .../safe_browsing/client_side_detection_service.cc | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -65,5 +65,5 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
void ClientSideDetectionService::HandlePhishingVerdict(
--
-2.11.0
+2.17.1
diff --git a/build/patches/translate-disable-fetching-of-translate-languages-from-server.patch b/build/patches/translate-disable-fetching-of-translate-languages-from-server.patch
index ebadd84a..624ff364 100644
--- a/build/patches/translate-disable-fetching-of-translate-languages-from-server.patch
+++ b/build/patches/translate-disable-fetching-of-translate-languages-from-server.patch
@@ -27,5 +27,5 @@ diff --git a/components/translate/core/browser/translate_language_list.cc b/comp
void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) {
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch b/build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch
index bb761aa3..7c6deb5a 100644
--- a/build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch
+++ b/build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch
@@ -7,29 +7,30 @@ NOTE: This can break Remote Debugging
This also fixes local debugging with domain substitution
Related comment: https://bugs.chromium.org/p/chromium/issues/detail?id=710701#c14
---
- third_party/blink/renderer/devtools/BUILD.gn | 6 ++----
- third_party/blink/renderer/devtools/front_end/audits_worker.json | 2 +-
- third_party/blink/renderer/devtools/front_end/devtools_app.json | 6 +++---
- third_party/blink/renderer/devtools/front_end/shell.json | 4 ++--
- third_party/blink/renderer/devtools/front_end/worker_app.json | 2 +-
+ third_party/blink/renderer/devtools/BUILD.gn | 6 ++----
+ .../blink/renderer/devtools/front_end/audits_worker.json | 2 +-
+ .../blink/renderer/devtools/front_end/devtools_app.json | 8 ++++----
+ third_party/blink/renderer/devtools/front_end/shell.json | 2 +-
+ .../blink/renderer/devtools/front_end/worker_app.json | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/third_party/blink/renderer/devtools/BUILD.gn b/third_party/blink/renderer/devtools/BUILD.gn
--- a/third_party/blink/renderer/devtools/BUILD.gn
+++ b/third_party/blink/renderer/devtools/BUILD.gn
-@@ -1290,10 +1290,8 @@ action("generate_devtools_grd") {
- devtools_embedder_scripts +
- [ "$resources_out_dir/devtools_extension_api.js" ]
+@@ -1621,11 +1621,9 @@ if (!external_devtools_frontend) {
+ "$resources_out_dir/InspectorBackendCommands.js",
+ ]
-- # Bundle remote modules in ChromeOS.
-- if (is_chromeos) {
-- grd_files += generated_remote_modules + devtools_emulated_devices_images
-- }
-+ # Always bundle remote modules.
-+ grd_files += generated_remote_modules + devtools_emulated_devices_images
+- # Bundle remote modules in ChromeOS.
+- if (is_chromeos) {
+- grd_files += generated_remote_modules + devtools_emulated_devices_images +
++ # Always bundle remote modules.
++ grd_files += generated_remote_modules + devtools_emulated_devices_images +
+ lighthouse_locale_files
+- }
- inputs = grd_files + devtools_image_files
- outfile = "$root_gen_dir/devtools/devtools_resources.grd"
+ inputs = grd_files + devtools_image_files
+ outfile = "$root_gen_dir/devtools/devtools_resources.grd"
diff --git a/third_party/blink/renderer/devtools/front_end/audits_worker.json b/third_party/blink/renderer/devtools/front_end/audits_worker.json
--- a/third_party/blink/renderer/devtools/front_end/audits_worker.json
+++ b/third_party/blink/renderer/devtools/front_end/audits_worker.json
@@ -44,7 +45,7 @@ diff --git a/third_party/blink/renderer/devtools/front_end/audits_worker.json b/
diff --git a/third_party/blink/renderer/devtools/front_end/devtools_app.json b/third_party/blink/renderer/devtools/front_end/devtools_app.json
--- a/third_party/blink/renderer/devtools/front_end/devtools_app.json
+++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json
-@@ -4,21 +4,21 @@
+@@ -4,23 +4,23 @@
{ "name": "inspector_main", "type": "autostart" },
{ "name": "mobile_throttling", "type": "autostart" },
@@ -53,7 +54,10 @@ diff --git a/third_party/blink/renderer/devtools/front_end/devtools_app.json b/t
{ "name": "animation" },
{ "name": "audits" },
{ "name": "browser_debugger" },
+ { "name": "css_overview" },
{ "name": "cookie_table" },
+- { "name": "dagre_layout", "type": "remote" },
++ { "name": "dagre_layout" },
{ "name": "devices" },
{ "name": "elements" },
- { "name": "emulated_devices" , "type": "remote" },
@@ -81,15 +85,6 @@ diff --git a/third_party/blink/renderer/devtools/front_end/shell.json b/third_pa
{ "name": "color_picker" },
{ "name": "console" },
{ "name": "coverage" },
-@@ -41,7 +41,7 @@
- { "name": "snippets" },
- { "name": "source_frame" },
- { "name": "sources" },
-- { "name": "terminal", "type": "remote" },
-+ { "name": "terminal" },
- { "name": "text_editor" },
- { "name": "workspace_diff" },
- { "name": "protocol_monitor"}
diff --git a/third_party/blink/renderer/devtools/front_end/worker_app.json b/third_party/blink/renderer/devtools/front_end/worker_app.json
--- a/third_party/blink/renderer/devtools/front_end/worker_app.json
+++ b/third_party/blink/renderer/devtools/front_end/worker_app.json
@@ -103,5 +98,5 @@ diff --git a/third_party/blink/renderer/devtools/front_end/worker_app.json b/thi
{ "name": "timeline" },
{ "name": "timeline_model" }
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-GCM.patch b/build/patches/ungoogled-chromium-Disable-GCM.patch
index b01baa5d..17e1b940 100644
--- a/build/patches/ungoogled-chromium-Disable-GCM.patch
+++ b/build/patches/ungoogled-chromium-Disable-GCM.patch
@@ -35,5 +35,5 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
last_checkin_time_,
device_checkin_info_.last_checkin_accounts,
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-Gaia.patch b/build/patches/ungoogled-chromium-Disable-Gaia.patch
index ba28315e..3f23b8e6 100644
--- a/build/patches/ungoogled-chromium-Disable-Gaia.patch
+++ b/build/patches/ungoogled-chromium-Disable-Gaia.patch
@@ -63,5 +63,5 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
// static
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch b/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch
index b761e329..09dfe2e6 100644
--- a/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch
+++ b/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch
@@ -4,27 +4,13 @@ Subject: ungoogled-chromium: Disable Google host detection
Disables various detections of Google hosts and functionality specific to them
---
- .../page_load_metrics/page_load_metrics_util.cc | 4 +-
- components/google/core/common/google_util.cc | 196 ++-------------------
- .../common/page_load_metrics_util.cc | 33 +---
- components/search_engines/template_url.cc | 6 +-
- net/base/url_util.cc | 21 ---
+ components/google/core/common/google_util.cc | 196 +-----------------
+ .../browser/page_load_metrics_util.cc | 4 +-
+ .../common/page_load_metrics_util.cc | 33 +--
+ components/search_engines/template_url.cc | 6 +-
+ net/base/url_util.cc | 21 --
5 files changed, 14 insertions(+), 246 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
-+++ b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
-@@ -171,9 +171,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
- }
-
- bool IsGoogleSearchHostname(const GURL& url) {
-- base::Optional result =
-- page_load_metrics::GetGoogleHostnamePrefix(url);
-- return result && result.value() == "www";
-+ return false;
- }
-
- bool IsGoogleSearchResultUrl(const GURL& url) {
diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -283,6 +269,20 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
}
bool IsGoogleAssociatedDomainUrl(const GURL& url) {
+diff --git a/components/page_load_metrics/browser/page_load_metrics_util.cc b/components/page_load_metrics/browser/page_load_metrics_util.cc
+--- a/components/page_load_metrics/browser/page_load_metrics_util.cc
++++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
+@@ -171,9 +171,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
+ }
+
+ bool IsGoogleSearchHostname(const GURL& url) {
+- base::Optional result =
+- page_load_metrics::GetGoogleHostnamePrefix(url);
+- return result && result.value() == "www";
++ return false;
+ }
+
+ bool IsGoogleSearchResultUrl(const GURL& url) {
diff --git a/components/page_load_metrics/common/page_load_metrics_util.cc b/components/page_load_metrics/common/page_load_metrics_util.cc
--- a/components/page_load_metrics/common/page_load_metrics_util.cc
+++ b/components/page_load_metrics/common/page_load_metrics_util.cc
@@ -374,5 +374,5 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc
}
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch b/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch
index 0a5dc1ff..9f987b40 100644
--- a/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch
+++ b/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch
@@ -23,5 +23,5 @@ diff --git a/components/network_time/network_time_tracker.cc b/components/networ
NetworkTimeTracker::FetchBehavior NetworkTimeTracker::GetFetchBehavior() const {
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-domain-reliability.patch b/build/patches/ungoogled-chromium-Disable-domain-reliability.patch
index 124e0ed9..1a4f6ec8 100644
--- a/build/patches/ungoogled-chromium-Disable-domain-reliability.patch
+++ b/build/patches/ungoogled-chromium-Disable-domain-reliability.patch
@@ -3,10 +3,10 @@ Date: Sat, 25 Aug 2018 22:58:52 +0200
Subject: ungoogled-chromium: Disable domain reliability
---
- components/domain_reliability/BUILD.gn | 42 +-
- components/domain_reliability/bake_in_configs.py | 2 +-
- components/domain_reliability/google_configs.cc | 565 -----------------------
- components/domain_reliability/uploader.cc | 2 +-
+ components/domain_reliability/BUILD.gn | 42 +-
+ .../domain_reliability/bake_in_configs.py | 2 +-
+ .../domain_reliability/google_configs.cc | 565 ------------------
+ components/domain_reliability/uploader.cc | 2 +-
4 files changed, 17 insertions(+), 594 deletions(-)
diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliability/BUILD.gn
@@ -672,5 +672,5 @@ diff --git a/components/domain_reliability/uploader.cc b/components/domain_relia
UploadResult result;
result.status = UploadResult::SUCCESS;
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-intranet-redirect-detector.patch b/build/patches/ungoogled-chromium-Disable-intranet-redirect-detector.patch
index 2cbbec62..20c6c282 100644
--- a/build/patches/ungoogled-chromium-Disable-intranet-redirect-detector.patch
+++ b/build/patches/ungoogled-chromium-Disable-intranet-redirect-detector.patch
@@ -24,5 +24,5 @@ diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intra
DCHECK(simple_loaders_.empty() && resulting_origins_.empty());
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch
index 1d40b99b..9e267ae5 100644
--- a/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch
+++ b/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch
@@ -4,15 +4,15 @@ Subject: ungoogled-chromium: Disable profile avatar downloading
Added some Bromite-specific further improvements
---
- chrome/browser/BUILD.gn | 2 --
- chrome/browser/profiles/profile_attributes_entry.cc | 14 --------------
- chrome/browser/profiles/profile_avatar_downloader.cc | 8 +-------
+ chrome/browser/BUILD.gn | 2 --
+ .../browser/profiles/profile_attributes_entry.cc | 14 --------------
+ .../browser/profiles/profile_avatar_downloader.cc | 8 +-------
3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
-@@ -1449,8 +1449,6 @@ jumbo_split_static_library("browser") {
+@@ -1385,8 +1385,6 @@ jumbo_static_library("browser") {
"profiles/profile_attributes_entry.h",
"profiles/profile_attributes_storage.cc",
"profiles/profile_attributes_storage.h",
@@ -24,7 +24,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
--- a/chrome/browser/profiles/profile_attributes_entry.cc
+++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -120,20 +120,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const {
+@@ -230,20 +230,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const {
}
const gfx::Image& ProfileAttributesEntry::GetAvatarIcon() const {
@@ -70,5 +70,5 @@ diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/brows
net::DefineNetworkTrafficAnnotation("profile_avatar", R"(
semantics {
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch
index 22365ab3..358f0495 100644
--- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch
+++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch
@@ -4,11 +4,11 @@ Subject: ungoogled-chromium: Disable translate integration
Remove translate offer
---
- .../android/java/res/xml/languages_preferences.xml | 5 -----
- .../languages/LanguagesPreferences.java | 22 ----------------------
- .../java/strings/android_chrome_strings.grd | 3 ---
- .../translate/core/browser/translate_manager.cc | 5 +++--
- .../translate/core/browser/translate_script.cc | 3 +--
+ .../java/res/xml/languages_preferences.xml | 5 -----
+ .../languages/LanguagesPreferences.java | 22 -------------------
+ .../java/strings/android_chrome_strings.grd | 3 ---
+ .../core/browser/translate_manager.cc | 5 +++--
+ .../core/browser/translate_script.cc | 3 +--
5 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/lan
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
-@@ -1211,9 +1211,6 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1194,9 +1194,6 @@ Your Google account may have other forms of browsing history like searches and a
Websites will show text in your preferred language, when possible.
@@ -104,7 +104,7 @@ diff --git a/components/translate/core/browser/translate_script.cc b/components/
+ &data_, "var securityOrigin = '';");
// Load embedded translate.js.
- base::StringPiece str =
+ data_.append(ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch
index a3a728ab..5055cbf7 100644
--- a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch
+++ b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch
@@ -132,5 +132,5 @@ diff --git a/rlz/lib/lib_values.h b/rlz/lib/lib_values.h
extern const int kFinancialPort;
--
-2.11.0
+2.17.1
diff --git a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch
index 4ee6351d..8087e34c 100644
--- a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch
+++ b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch
@@ -3,7 +3,7 @@ Date: Mon, 12 Feb 2018 21:21:36 +0100
Subject: ungoogled-chromium: Disable webRTC log uploader
---
- chrome/browser/media/webrtc/webrtc_log_uploader.cc | 27 ++++------------------
+ .../media/webrtc/webrtc_log_uploader.cc | 27 +++----------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -51,5 +51,5 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
SetupMultipart(post_data.get(), compressed_log,
upload_done_data.paths.incoming_rtp_dump,
--
-2.11.0
+2.17.1
diff --git a/build/patches/updater-disable-updater-pings.patch b/build/patches/updater-disable-updater-pings.patch
index 3ca043a0..e1053852 100644
--- a/build/patches/updater-disable-updater-pings.patch
+++ b/build/patches/updater-disable-updater-pings.patch
@@ -6,9 +6,9 @@ Despite auto-updater being arguably disabled (see previous commit),
Chromium would still send background requests. Kill it.
(trk:170, trk:171)
---
- components/component_updater/component_updater_url_constants.cc | 4 ++--
- components/component_updater/configurator_impl.cc | 5 +----
- components/component_updater/configurator_impl.h | 1 -
+ .../component_updater/component_updater_url_constants.cc | 4 ++--
+ components/component_updater/configurator_impl.cc | 5 +----
+ components/component_updater/configurator_impl.h | 1 -
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/components/component_updater/component_updater_url_constants.cc b/components/component_updater/component_updater_url_constants.cc
@@ -60,5 +60,5 @@ diff --git a/components/component_updater/configurator_impl.h b/components/compo
const int initial_delay_;
--
-2.11.0
+2.17.1