From 28e950d9beaafe30f683959d1789cf9915ac8d38 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Mon, 21 Oct 2019 16:23:03 +0200
Subject: [PATCH] Updated patches to fix #387 and #388

---
 ...dd-custom-tab-intents-privacy-option.patch |  8 +-
 ...-to-not-persist-tabs-across-sessions.patch |  4 +-
 build/patches/Disable-data-saver.patch        |  2 +-
 build/patches/Disable-safe-browsing.patch     | 76 +++----------------
 ...le-signin-and-data-saver-preferences.patch | 76 +++++++++++++++----
 ...romium-Disable-translate-integration.patch |  2 +-
 build/patches_list.txt                        | 12 +--
 7 files changed, 88 insertions(+), 92 deletions(-)

diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch
index abc3dd41..c2e03723 100644
--- a/build/patches/Add-custom-tab-intents-privacy-option.patch
+++ b/build/patches/Add-custom-tab-intents-privacy-option.patch
@@ -69,10 +69,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
      @Override
      public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
          PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
-@@ -99,6 +101,10 @@ public class PrivacyPreferences
-         String key = preference.getKey();
-         if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+@@ -101,6 +103,10 @@ public class PrivacyPreferences
              PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
+         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
 +        } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
          }
  
          return true;
-@@ -134,6 +140,11 @@ public class PrivacyPreferences
+@@ -136,6 +142,11 @@ public class PrivacyPreferences
                      prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
          }
  
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 5bfb32b8..4d9a9e97 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
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
      private static final String PREF_DO_NOT_TRACK = "do_not_track";
      private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
  
-@@ -105,6 +108,10 @@ public class PrivacyPreferences
+@@ -107,6 +110,10 @@ public class PrivacyPreferences
              SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
              sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
              sharedPreferencesEditor.apply();
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
          }
  
          return true;
-@@ -155,6 +162,11 @@ public class PrivacyPreferences
+@@ -157,6 +164,11 @@ public class PrivacyPreferences
              boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
              contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
          }
diff --git a/build/patches/Disable-data-saver.patch b/build/patches/Disable-data-saver.patch
index 08b7bb62..f8c9af07 100644
--- a/build/patches/Disable-data-saver.patch
+++ b/build/patches/Disable-data-saver.patch
@@ -44,7 +44,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/dat
 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
-@@ -1321,9 +1321,6 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1288,9 +1288,6 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_DATA_REDUCTION_DESCRIPTION_LITE_MODE" desc="Text describing how the Lite mode feature works. Seen only before the user has enabled the feature.">
          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.
        </message>
diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch
index aea1f9c7..951d55e2 100644
--- a/build/patches/Disable-safe-browsing.patch
+++ b/build/patches/Disable-safe-browsing.patch
@@ -7,11 +7,9 @@ Originally based on ungoogled-chromium patch
  chrome/android/chrome_java_sources.gni             |  1 -
  .../android/java/res/xml/privacy_preferences.xml   | 21 -----
  .../java/res/xml/sync_and_services_preferences.xml | 20 -----
- .../preferences/privacy/PrivacyPreferences.java    | 99 ----------------------
- .../sync/SyncAndServicesPreferences.java           |  7 --
- .../preferences/sync/SyncPreferenceUtils.java      |  3 -
+ .../preferences/privacy/PrivacyPreferences.java    | 97 ----------------------
  .../chrome/browser/webshare/ShareServiceImpl.java  |  6 --
- .../java/strings/android_chrome_strings.grd        | 42 ---------
+ .../java/strings/android_chrome_strings.grd        | 33 --------
  chrome/browser/BUILD.gn                            |  2 -
  chrome/browser/browser_process.h                   | 16 ----
  chrome/browser/browser_process_impl.cc             | 36 --------
@@ -57,7 +55,7 @@ Originally based on ungoogled-chromium patch
  .../native_file_system_file_writer_impl.cc         | 46 +---------
  .../native_file_system_file_writer_impl.h          | 15 +---
  .../native_file_system_permission_context.h        |  7 --
- 53 files changed, 119 insertions(+), 862 deletions(-)
+ 51 files changed, 119 insertions(+), 841 deletions(-)
 
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
@@ -222,7 +220,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
          updateSummaries();
       }
  
-@@ -146,18 +114,6 @@ public class PrivacyPreferences
+@@ -146,18 +114,8 @@ public class PrivacyPreferences
          String key = preference.getKey();
          if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
              PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
@@ -231,8 +229,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 -        } else if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
 -            PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
 -                    (boolean) newValue);
--        } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
--            PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
+         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
 -        } else if (PREF_NAVIGATION_ERROR.equals(key)) {
 -            PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
 -        } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
@@ -241,7 +239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
          }
  
          return true;
-@@ -180,32 +136,12 @@ public class PrivacyPreferences
+@@ -180,32 +138,12 @@ public class PrivacyPreferences
          CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
          CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
  
@@ -274,7 +272,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
          CheckBoxPreference canMakePaymentPref =
                  (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
          if (canMakePaymentPref != null) {
-@@ -223,50 +159,15 @@ public class PrivacyPreferences
+@@ -223,50 +161,15 @@ public class PrivacyPreferences
              boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
              contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
          }
@@ -325,37 +323,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
              if (PREF_NETWORK_PREDICTIONS.equals(key)) {
                  return prefs.isNetworkPredictionManaged();
              }
-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
- 
-         mPrivacyPrefManager.migrateNetworkPredictionPreferences();
- 
--        getActivity().setTitle(R.string.prefs_sync_and_services);
-         setHasOptionsMenu(true);
--        if (mIsFromSigninScreen) {
--            ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
--            assert actionBar != null;
--            actionBar.setHomeActionContentDescription(
--                    R.string.prefs_sync_and_services_content_description);
--        }
- 
-         PreferenceUtils.addPreferencesFromResource(this, R.xml.sync_and_services_preferences);
- 
-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()) {
-                 return res.getString(R.string.sync_need_passphrase);
-             }
--            if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
--                return context.getString(R.string.sync_and_services_summary_sync_on);
--            }
-             return context.getString(R.string.account_management_sync_summary, accountName);
-         }
-         return context.getString(R.string.sync_is_disabled);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
@@ -382,26 +349,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareS
 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
-@@ -351,18 +351,9 @@ CHAR-LIMIT guidelines:
-       <message name="IDS_SIGN_IN_TO_CHROME" desc="Title for the button to sign in to Chrome using one's Google account. [CHAR-LIMIT=27]">
-         Sign in to Chrome
-       </message>
--      <message name="IDS_PREFS_SYNC_AND_SERVICES" desc="Title for Settings section to manage data collection for Sync and Google services. [CHAR-LIMIT=40]">
--        Sync and Google services
--      </message>
--      <message name="IDS_PREFS_SYNC_AND_SERVICES_CONTENT_DESCRIPTION" desc="The accessibility text to read when the 'Sync and Google services' Settings page is opened from the sign-in page. This text is attached to the 'Navigate Up' button shown at the top of the screen. The first two sentences describe the screen that is currently shown to the user, while 'Navigate up' is a description for the button this text is attached to. 'Navigate up' should match TC ID 6794660482873516081.">
--        You are currently customizing your Sync and Google service settings. To finish turning on sync, tap the Confirm button near the bottom of the screen. Navigate up
--      </message>
-       <message name="IDS_SIGNIN_PREF_SUMMARY" desc="Summary for the entry in Settings to sign in to Chrome, explaining benefits of signing in.">
-         Sync and personalize across devices
-       </message>
--      <message name="IDS_SYNC_AND_SERVICES_SUMMARY_SYNC_ON" desc="Summary for 'Sync and Google services' preference row when sync is enabled.">
--        Sync is on
--      </message>
-       <message name="IDS_SIGN_IN_TO_CHROME_DISABLED_SUMMARY" desc="A descriptive line of text that appears under the 'Sign in to Chrome' option, in Chrome Settings on Android. The text explains why 'Sign in to Chrome' is disabled. 'Administrator' refers to the IT administrator of the company/organization that owns the user’s device.">
-         Disabled by the administrator of this device
-       </message>
-@@ -406,12 +397,6 @@ CHAR-LIMIT guidelines:
+@@ -406,12 +406,6 @@ CHAR-LIMIT guidelines:
        <message name="IDS_PRELOAD_PAGES_SUMMARY" desc="Summary for a checkbox in Settings that controls pages preloading and informs the user about the data shared by this feature.">
          Uses cookies to remember your preferences, even if you don't visit those pages
        </message>
@@ -414,7 +362,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
        <message name="IDS_URL_KEYED_ANONYMIZED_DATA_TITLE" desc="Title for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
          Make searches and browsing better
        </message>
-@@ -421,12 +406,6 @@ CHAR-LIMIT guidelines:
+@@ -421,12 +415,6 @@ CHAR-LIMIT guidelines:
        <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK" desc="The text for Privacy preferences that is shown after all preference rows.">
          For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK">&lt;link&gt;</ph>Sync and Google services<ph name="END_LINK">&lt;/link&gt;</ph>
        </message>
@@ -427,7 +375,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
        <message name="IDS_CANCEL_SYNC_DIALOG_TITLE" desc="The title of a dialog that is shown when users tries closing 'Sync and Google services' preferences without confirming the changes.">
          Cancel sync?
        </message>
-@@ -728,30 +707,12 @@ CHAR-LIMIT guidelines:
+@@ -728,30 +716,12 @@ CHAR-LIMIT guidelines:
        <message name="IDS_PREFS_PRIVACY" desc="Title for the Privacy preferences. [CHAR-LIMIT=32]">
          Privacy
        </message>
@@ -458,7 +406,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
        <message name="IDS_NETWORK_PREDICTIONS_TITLE" desc="Title of a setting in Chrome settings. Followed by a body that describes the setting. If setting is turned on, Chrome will download certain pages to the user’s phone automatically for offline reading. 'predictions' convey the idea that Chrome is using predictive models to figure out pages likely of interest to the user.">
          Use page predictions
        </message>
-@@ -4047,9 +4008,6 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -4047,9 +4017,6 @@ The site does NOT gain access to the camera. The camera images are only visible
        <message name="IDS_USAGE_STATS_CONSENT_PROMPT" desc="Consent prompt when authorizing Digital Wellbeing to access Chrome usage data">
         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.
        </message>
diff --git a/build/patches/Disable-signin-and-data-saver-preferences.patch b/build/patches/Disable-signin-and-data-saver-preferences.patch
index 58ec9e43..07c238a4 100644
--- a/build/patches/Disable-signin-and-data-saver-preferences.patch
+++ b/build/patches/Disable-signin-and-data-saver-preferences.patch
@@ -8,8 +8,10 @@ Never show the data saver promo snackbar
  .../android/java/res/xml/privacy_preferences.xml   |  7 --
  .../browser/preferences/MainPreferences.java       | 86 +---------------------
  .../preferences/privacy/PrivacyPreferences.java    | 15 ----
- .../java/strings/android_chrome_strings.grd        |  6 --
- 5 files changed, 1 insertion(+), 133 deletions(-)
+ .../sync/SyncAndServicesPreferences.java           |  7 --
+ .../preferences/sync/SyncPreferenceUtils.java      |  3 -
+ .../java/strings/android_chrome_strings.grd        | 15 ----
+ 7 files changed, 1 insertion(+), 152 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
@@ -51,7 +53,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 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
-@@ -59,12 +59,5 @@
+@@ -38,12 +38,5 @@
          android:title="@string/clear_browsing_data_title"
          android:summary="@string/clear_browsing_data_summary"
          android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
@@ -269,7 +271,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/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
-@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.preferences.Pref;
+@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.preferences.PrefServiceBridge;
  import org.chromium.chrome.browser.preferences.PreferenceUtils;
  import org.chromium.chrome.browser.preferences.PreferencesLauncher;
@@ -277,17 +279,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
  import org.chromium.ui.text.NoUnderlineClickableSpan;
-@@ -47,9 +46,6 @@ public class PrivacyPreferences
+@@ -41,9 +40,6 @@ public class PrivacyPreferences
+     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
      private static final String PREF_DO_NOT_TRACK = "do_not_track";
-     private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
      private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
 -    private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER =
 -            "sync_and_services_link_divider";
 -    private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
-     private static final String PREF_USAGE_STATS = "usage_stats_reporting";
  
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
-@@ -97,20 +93,9 @@ public class PrivacyPreferences
+ 
+@@ -86,20 +82,9 @@ public class PrivacyPreferences
              networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
              preferenceScreen.addPreference(networkPredictionPref);
  
@@ -306,12 +308,43 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 -        preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
 -        preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
  
-         ChromeBaseCheckBoxPreference navigationErrorPref =
-                 (ChromeBaseCheckBoxPreference) findPreference(PREF_NAVIGATION_ERROR);
+         ChromeBaseCheckBoxPreference searchSuggestionsPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
+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
+ 
+         mPrivacyPrefManager.migrateNetworkPredictionPreferences();
+ 
+-        getActivity().setTitle(R.string.prefs_sync_and_services);
+         setHasOptionsMenu(true);
+-        if (mIsFromSigninScreen) {
+-            ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
+-            assert actionBar != null;
+-            actionBar.setHomeActionContentDescription(
+-                    R.string.prefs_sync_and_services_content_description);
+-        }
+ 
+         PreferenceUtils.addPreferencesFromResource(this, R.xml.sync_and_services_preferences);
+ 
+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()) {
+                 return res.getString(R.string.sync_need_passphrase);
+             }
+-            if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
+-                return context.getString(R.string.sync_and_services_summary_sync_on);
+-            }
+             return context.getString(R.string.account_management_sync_summary, accountName);
+         }
+         return context.getString(R.string.sync_is_disabled);
 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,9 +345,6 @@ CHAR-LIMIT guidelines:
+@@ -345,24 +345,12 @@ CHAR-LIMIT guidelines:
        </message>
  
        <!-- Sign-in, sync and personalization preferences -->
@@ -321,15 +354,30 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
        <message name="IDS_SIGN_IN_TO_CHROME" desc="Title for the button to sign in to Chrome using one's Google account. [CHAR-LIMIT=27]">
          Sign in to Chrome
        </message>
-@@ -418,9 +415,6 @@ CHAR-LIMIT guidelines:
+-      <message name="IDS_PREFS_SYNC_AND_SERVICES" desc="Title for Settings section to manage data collection for Sync and Google services. [CHAR-LIMIT=40]">
+-        Sync and Google services
+-      </message>
+-      <message name="IDS_PREFS_SYNC_AND_SERVICES_CONTENT_DESCRIPTION" desc="The accessibility text to read when the 'Sync and Google services' Settings page is opened from the sign-in page. This text is attached to the 'Navigate Up' button shown at the top of the screen. The first two sentences describe the screen that is currently shown to the user, while 'Navigate up' is a description for the button this text is attached to. 'Navigate up' should match TC ID 6794660482873516081.">
+-        You are currently customizing your Sync and Google service settings. To finish turning on sync, tap the Confirm button near the bottom of the screen. Navigate up
+-      </message>
+       <message name="IDS_SIGNIN_PREF_SUMMARY" desc="Summary for the entry in Settings to sign in to Chrome, explaining benefits of signing in.">
+         Sync and personalize across devices
+       </message>
+-      <message name="IDS_SYNC_AND_SERVICES_SUMMARY_SYNC_ON" desc="Summary for 'Sync and Google services' preference row when sync is enabled.">
+-        Sync is on
+-      </message>
+       <message name="IDS_SIGN_IN_TO_CHROME_DISABLED_SUMMARY" desc="A descriptive line of text that appears under the 'Sign in to Chrome' option, in Chrome Settings on Android. The text explains why 'Sign in to Chrome' is disabled. 'Administrator' refers to the IT administrator of the company/organization that owns the user’s device.">
+         Disabled by the administrator of this device
+       </message>
+@@ -412,9 +400,6 @@ CHAR-LIMIT guidelines:
        <message name="IDS_URL_KEYED_ANONYMIZED_DATA_SUMMARY" desc="Summary for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
          Sends URLs of pages you visit to Google
        </message>
 -      <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK" desc="The text for Privacy preferences that is shown after all preference rows.">
 -        For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK">&lt;link&gt;</ph>Sync and Google services<ph name="END_LINK">&lt;/link&gt;</ph>
 -      </message>
-       <message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE" desc="Title for a preference that enables sending usage statistics and crash reports.">
-         Help improve Chrome's features and performance
+       <message name="IDS_CANCEL_SYNC_DIALOG_TITLE" desc="The title of a dialog that is shown when users tries closing 'Sync and Google services' preferences without confirming the changes.">
+         Cancel sync?
        </message>
 -- 
 2.11.0
diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch
index 22365ab3..1043ef92 100644
--- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch
+++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch
@@ -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
+@@ -1217,9 +1217,6 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_LANGUAGES_LIST_PREFS_DESCRIPTION" desc="Description on the Languages settings screen. Appears above a list of one or more languages that the user selects, to tell Chrome which languages they prefer to use to read website content.">
          Websites will show text in your preferred language, when possible.
        </message>
diff --git a/build/patches_list.txt b/build/patches_list.txt
index b810c7a3..532105f6 100644
--- a/build/patches_list.txt
+++ b/build/patches_list.txt
@@ -19,12 +19,6 @@ Do-not-store-passwords-by-default.patch
 Disable-NTP-remote-suggestions-by-default.patch
 Disable-references-to-fonts.googleapis.com.patch
 Disable-WebRTC-by-default.patch
-Disable-data-saver.patch
-Skip-the-first-run-and-metrics.patch
-Disable-signin-and-data-saver-preferences.patch
-Disable-signin-data-reduction-promos.patch
-Remove-recent-tabs-signin.patch
-Remove-background-sync-and-translate-menu-options.patch
 Disable-unused-permissions.patch
 Never-send-any-crash-upload-data.patch
 Hide-send-reports-checkbox.patch
@@ -44,6 +38,12 @@ safe_browsing-disable-incident-reporting.patch
 safe_browsing-disable-reporting-of-safebrowsing-override.patch
 safe_browsing-disable-cookie-transmission.patch
 Disable-safe-browsing.patch
+Disable-data-saver.patch
+Skip-the-first-run-and-metrics.patch
+Disable-signin-and-data-saver-preferences.patch
+Disable-signin-data-reduction-promos.patch
+Remove-recent-tabs-signin.patch
+Remove-background-sync-and-translate-menu-options.patch
 Hide-passwords-manager-link.patch
 Disable-Omaha-update-checks.patch
 Disable-update-scheduler.patch