Update/port to 119.0.6045.53

args.gn

@@ -3,8 +3,8 @@ target_os = "android"
 target_cpu = "arm64"
 
 android_channel = "stable"
-android_default_version_name = "118.0.5993.111"
-android_default_version_code = "599311100"
+android_default_version_name = "119.0.6045.53"
+android_default_version_code = "604505300"
 
 ext_version_enabled = true
 ext_version_increment = "0"

patches/0001-disable-checkout_nacl.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index 5e91cf388ad51..8c318ad6bf399 100644
+index 6d0098b01ea02..1b5ecb747f234 100644
 --- a/DEPS
 +++ b/DEPS
-@@ -123,7 +123,7 @@ vars = {
+@@ -119,7 +119,7 @@ vars = {
 
    # Check out and download nacl by default, unless on an arm mac.
    # This can be disabled e.g. with custom_vars.

patches/0003-switch-to-fstack-protector-strong.patch

@@ -4,23 +4,19 @@ Date: Wed, 26 Dec 2018 10:20:24 -0500
 Subject: [PATCH] switch to -fstack-protector-strong
 
 ---
- build/config/compiler/BUILD.gn | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
+ build/config/compiler/BUILD.gn | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 06812fb9c2188..c3abb3009a563 100644
+index 6d05512ae3644..77a913e864f79 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -368,18 +368,12 @@ config("compiler") {
+@@ -372,14 +372,12 @@ config("compiler") {
            cflags += [ "-fstack-protector" ]
          }
        } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
 -        # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc supports it.
 -        # See also https://crbug.com/533294
--        if (current_os != "zos") {
--          cflags += [ "--param=ssp-buffer-size=4" ]
--        }
--
          # The x86 toolchain currently has problems with stack-protector.
          if (is_android && current_cpu == "x86") {
            cflags += [ "-fno-stack-protector" ]

patches/0004-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index c3abb3009a563..bb23226f8580d 100644
+index 77a913e864f79..9765e5e9ce601 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -385,6 +385,10 @@ config("compiler") {
+@@ -389,6 +389,10 @@ config("compiler") {
        }
      }
 

patches/0005-enable-ftrivial-auto-var-init-zero.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] enable -ftrivial-auto-var-init=zero
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index bb23226f8580d..55ef720b88846 100644
+index 9765e5e9ce601..c417df03d536f 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -389,6 +389,10 @@ config("compiler") {
+@@ -393,6 +393,10 @@ config("compiler") {
        cflags += [ "-fwrapv" ]
      }
 

patches/0006-disable-broken-warning-for-auto-var-init.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] disable broken warning for auto var init
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 55ef720b88846..1dd265d278c61 100644
+index c417df03d536f..7fbc461799d2c 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -390,7 +390,7 @@ config("compiler") {
+@@ -394,7 +394,7 @@ config("compiler") {
      }
 
      if (is_clang) {

patches/0007-Vanadium-branding.patch

@@ -49,7 +49,7 @@ Current incantation of the recolor command:
  create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index e89e2f7d23cdf..71024b8249305 100644
+index f56c41b506f45..b0721898be7d7 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -150,24 +150,24 @@ if (current_toolchain == default_toolchain) {
@@ -95,7 +95,7 @@ index e89e2f7d23cdf..71024b8249305 100644
      ]
    }
 
-@@ -2102,24 +2102,24 @@ if (current_toolchain == default_toolchain) {
+@@ -2133,24 +2133,24 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_base_module_resources") {
      resource_overlay = true
      sources = [

patches/0010-Remove-logo-from-chrome-version.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] Remove logo from chrome://version
  1 file changed, 7 deletions(-)
 
 diff --git a/components/version_ui/resources/about_version.html b/components/version_ui/resources/about_version.html
-index 5d04b4b360e33..50ac5af87fbb4 100644
+index 508c4ecfd790f..e0045fb361640 100644
 --- a/components/version_ui/resources/about_version.html
 +++ b/components/version_ui/resources/about_version.html
-@@ -55,13 +55,6 @@ about:version template page
+@@ -53,13 +53,6 @@ about:version template page
                    media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)">
            <img alt="$i18n{logo_alt_text}" src="chrome://theme/IDR_PRODUCT_LOGO">
          </picture>

patches/0012-remove-Google-prefix-from-storage-settings-label.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] remove Google prefix from storage settings label
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-index 838f16105c369..b8949c44aef20 100644
+index c9a24ec75d12b..5077dd63f7aa6 100644
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4551,7 +4551,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4607,7 +4607,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
 
        <!-- Storage Preference UI strings for clearing storage. -->
        <message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL" desc="Title for Vanadium's Manage Space Activity.">

patches/0014-hide-passwords.google.com-link-when-not-supported.patch

@@ -8,22 +8,22 @@ Subject: [PATCH] hide passwords.google.com link when not supported
  1 file changed, 4 insertions(+)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-index b6d1a25a6ab6c..b3193ef3a3990 100644
+index 118c5ec8d81e2..ef010a06ef2e6 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.profiles.Profile;
+@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
  import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
- import org.chromium.chrome.browser.settings.ProfileDependentSetting;
  import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
 +import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
  import org.chromium.chrome.browser.sync.SyncServiceFactory;
  import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
-@@ -631,6 +632,9 @@ public class PasswordSettings extends PreferenceFragmentCompat
+@@ -633,6 +634,9 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
          if (mSearchQuery != null && !mNoPasswords) {
              return; // Don't add the Manage Account link if there is a search going on.
          }
-+        if (!IdentityServicesProvider.get().getSigninManager(mProfile).isSigninSupported(false)) {
++        if (!IdentityServicesProvider.get().getSigninManager(getProfile()).isSigninSupported(false)) {
 +            return;
 +        }
          if (getPreferenceScreen().findPreference(PREF_KEY_MANAGE_ACCOUNT_LINK) != null) {

patches/0019-disable-navigation-error-correction-by-default.patch

@@ -8,15 +8,15 @@ Subject: [PATCH] disable navigation error correction by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
-index fd92bb9a1f148..38824c029865a 100644
+index 6271f349464b9..a3c64d526dd54 100644
 --- a/chrome/browser/net/profile_network_context_service.cc
 +++ b/chrome/browser/net/profile_network_context_service.cc
-@@ -432,7 +432,7 @@ void ProfileNetworkContextService::UpdateAdditionalCertificates() {
+@@ -411,7 +411,7 @@ void ProfileNetworkContextService::UpdateAdditionalCertificates() {
  void ProfileNetworkContextService::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
--      embedder_support::kAlternateErrorPagesEnabled, true,
-+      embedder_support::kAlternateErrorPagesEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
+-                                true);
++                                false);
    registry->RegisterBooleanPref(prefs::kQuicAllowed, true);
    registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled,
+                                 false);

patches/0021-disable-network-prediction-by-default.patch

@@ -4,13 +4,13 @@ Date: Wed, 23 Nov 2016 08:31:44 -0500
 Subject: [PATCH] disable network prediction by default
 
 ---
- chrome/browser/prefetch/prefetch_prefs.h | 2 +-
+ chrome/browser/preloading/preloading_prefs.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/prefetch_prefs.h
-index 482b0415a8c9c..d6931fabfc95d 100644
---- a/chrome/browser/prefetch/prefetch_prefs.h
-+++ b/chrome/browser/prefetch/prefetch_prefs.h
+diff --git a/chrome/browser/preloading/preloading_prefs.h b/chrome/browser/preloading/preloading_prefs.h
+index 20d7692b46deb..11632e3994c52 100644
+--- a/chrome/browser/preloading/preloading_prefs.h
++++ b/chrome/browser/preloading/preloading_prefs.h
 @@ -23,7 +23,7 @@ enum class NetworkPredictionOptions {
    kWifiOnlyDeprecated = 1,
    kDisabled = 2,

patches/0023-disable-hyperlink-auditing-by-default.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] disable hyperlink auditing by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index 6f989cff781d7..bd27ed80642f2 100644
+index 9b845c0e331c4..c1aa9d8d4ee8c 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
 @@ -1608,7 +1608,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(

patches/0025-disable-article-suggestions-feature-by-default.patch

@@ -4,21 +4,23 @@ Date: Thu, 8 Mar 2018 22:43:12 -0500
 Subject: [PATCH] disable article suggestions feature by default
 
 ---
- components/feed/core/shared_prefs/pref_names.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ components/feed/core/shared_prefs/pref_names.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/core/shared_prefs/pref_names.cc
-index 71586a65fcd92..b353a93d81469 100644
+index 7ac1995862d0b..954915d2fedfe 100644
 --- a/components/feed/core/shared_prefs/pref_names.cc
 +++ b/components/feed/core/shared_prefs/pref_names.cc
-@@ -19,8 +19,8 @@ const char kEnableSnippets[] = "ntp_snippets.enable";
- const char kArticlesListVisible[] = "ntp_snippets.list_visible";
+@@ -24,9 +24,9 @@ const char kArticlesListVisible[] = "ntp_snippets.list_visible";
+ const char kEnableSnippetsByDse[] = "ntp_snippets_by_dse.enable";
 
  void RegisterFeedSharedProfilePrefs(PrefRegistrySimple* registry) {
 -  registry->RegisterBooleanPref(kEnableSnippets, true);
 -  registry->RegisterBooleanPref(kArticlesListVisible, true);
+-  registry->RegisterBooleanPref(kEnableSnippetsByDse, true);
 +  registry->RegisterBooleanPref(kEnableSnippets, false);
 +  registry->RegisterBooleanPref(kArticlesListVisible, false);
++  registry->RegisterBooleanPref(kEnableSnippetsByDse, false);
  }
 
  }  // namespace prefs

patches/0026-disable-content-feed-suggestions-by-default.patch

@@ -4,28 +4,14 @@ Date: Sun, 22 Mar 2020 01:23:48 -0400
 Subject: [PATCH] disable content feed suggestions by default
 
 ---
- .../org/chromium/chrome/browser/flags/ChromeFeatureList.java    | 2 +-
- components/feed/feed_feature_list.cc                            | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ components/feed/feed_feature_list.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-index 962a3f80cead2..42d01feba0bdd 100644
---- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -568,7 +568,7 @@ public abstract class ChromeFeatureList {
-             new CachedFlag(INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false);
-     public static final CachedFlag sInstanceSwitcher = new CachedFlag(INSTANCE_SWITCHER, true);
-     public static final CachedFlag sInstantStart = new CachedFlag(INSTANT_START, false);
--    public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true);
-+    public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, false);
-     public static final CachedFlag sNewTabSearchEngineUrlAndroid =
-             new CachedFlag(NEW_TAB_SEARCH_ENGINE_URL_ANDROID, false);
-     public static final CachedFlag sPrivacyGuideAndroid3 =
 diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
-index fd4eaa23ab215..14de68240c883 100644
+index acda50bc47a18..646098ffeb184 100644
 --- a/components/feed/feed_feature_list.cc
 +++ b/components/feed/feed_feature_list.cc
-@@ -24,7 +24,7 @@ BASE_FEATURE(kInterestFeedContentSuggestions,
+@@ -21,7 +21,7 @@ namespace feed {
  // changed, please update the cached one's default value in CachedFeatureFlags.
  BASE_FEATURE(kInterestFeedV2,
               "InterestFeedV2",

patches/0027-disable-sensors-access-by-default.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] disable sensors access by default
  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
-index 0486610875890..890a178c0a573 100644
+index f8abed2309f06..5e5b1b2667f7c 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -346,7 +346,7 @@ void ContentSettingsRegistry::Init() {
+@@ -337,7 +337,7 @@ void ContentSettingsRegistry::Init() {
    // TODO(crbug.com/904439): Update this to "SECURE_ONLY" once
    // DeviceOrientationEvents and DeviceMotionEvents are only fired in secure
    // contexts.

patches/0028-block-playing-protected-media-by-default.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] block playing protected media by default
  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
-index 890a178c0a573..73cbf4848c2d0 100644
+index 5e5b1b2667f7c..dddcd1e1f2be7 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -209,7 +209,7 @@ void ContentSettingsRegistry::Init() {

patches/0029-disable-third-party-cookies-by-default.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] disable third party cookies by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
-index 3adbd6441eaf8..588c6b296dc4c 100644
+index e9fff753b2050..77708c1b4ee41 100644
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -68,7 +68,7 @@ void CookieSettings::RegisterProfilePrefs(
+@@ -74,7 +74,7 @@ void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterIntegerPref(
        prefs::kCookieControlsMode,

patches/0030-disable-background-sync-by-default.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] disable background sync by default
  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
-index 73cbf4848c2d0..f8d17b160da4e 100644
+index dddcd1e1f2be7..a01f612ca3c8f 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -236,7 +236,7 @@ void ContentSettingsRegistry::Init() {

patches/0032-disable-media-router-media-remoting-by-default.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] disable media router media remoting by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
-index 5dc6b9392856d..f78dde88e8e7e 100644
+index b7327c8577bf1..74d96b65e856d 100644
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -157,7 +157,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
                                 PrefRegistry::PUBLIC);
    registry->RegisterBooleanPref(

patches/0033-disable-media-router-by-default.patch

@@ -9,10 +9,10 @@ Subject: [PATCH] disable media router by default
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
-index f78dde88e8e7e..bd1cbb95aefff 100644
+index 74d96b65e856d..2d94eac346998 100644
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -144,7 +144,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
+@@ -134,7 +134,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
      pref_values.insert(std::make_pair(context, allowed));
      return allowed;
    }
@@ -22,7 +22,7 @@ index f78dde88e8e7e..bd1cbb95aefff 100644
 
  #if !BUILDFLAG(IS_ANDROID)
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index f3e41082fe306..d39f050f44676 100644
+index 90859a99248a4..a48e967d93ae7 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
 @@ -412,7 +412,7 @@ void ProfileImpl::RegisterProfilePrefs(

patches/0034-disable-offering-translations-by-default.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] disable offering translations by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index 1d312986c62de..78235f4161394 100644
+index 83d3c4331fcda..f97970e4852bc 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
 @@ -82,7 +82,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {

patches/0035-disable-browser-sign-in-feature-by-default.patch

@@ -22,10 +22,10 @@ index c495783de021a..430eac0cf5da8 100644
 
  // static
 diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
-index 1558c2342710e..9581eb7db57f1 100644
+index ce2bb875b1e10..9a327a2df7d0b 100644
 --- a/components/signin/internal/identity_manager/primary_account_manager.cc
 +++ b/components/signin/internal/identity_manager/primary_account_manager.cc
-@@ -148,7 +148,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -149,7 +149,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false);
    registry->RegisterBooleanPref(prefs::kAutologinEnabled, true);
    registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList);