update to 98.0.4758.108, fix the conflict

README.md

@@ -52,13 +52,13 @@ cd /tank/chromium4allen/src
 
 ## Prepare Chromium
 
-The patches are intended to be applied to the `95.0.4638.78` tag of
+The patches are intended to be applied to the `98.0.4758.108` tag of
 the Chromium repo. Before continuing, make sure you are on that tag in
 the Chromium source repo:
 
 ```
 git fetch origin
-git checkout -B promethean-95.0.4638.78 95.0.4638.78
+git checkout -B promethean-98.0.4758.108 98.0.4758.108
 gclient sync --with_branch_heads --with_tags
 gclient runhooks
 ```
@@ -88,7 +88,7 @@ done
 ```
 
 All patches should apply cleanly. If they did not, make sure you have
-checked out the proper Chromium tag (95.0.4638.78).
+checked out the proper Chromium tag (98.0.4758.108).
 
 ## Getting the third dependencies
 
@@ -160,11 +160,11 @@ If you do not have an upstream remote, add it with:
 
     git describe --tags --abbrev=0 upstream/master
 
-This will give you output like `94.0.4606.94` which we'll use as an example going forward.
+This will give you output like `98.0.4758.108` which we'll use as an example going forward.
 
 4. Create a new branch based on this tag
 
-    git checkout -b upstream-94.0.4606.94 94.0.4606.94
+    git checkout -b upstream-98.0.4758.108 98.0.4758.108
 
 5. Rebase this branch on the current master
 

build/bromite.gn_args

@@ -35,6 +35,8 @@ safe_browsing_mode=0
 symbol_level=1
 system_webview_package_name="org.bromite.webview"
 target_os="android"
+target_cpu="arm"
+treat_warnings_as_errors=false
 use_cfi_cast = true
 use_debug_fission=true
 use_errorprone_java_compiler=false

build/bromite_patches_list.txt

@@ -163,7 +163,6 @@ Disable-lock-icon-in-address-bar-by-default.patch
 Add-custom-tab-intents-privacy-option.patch
 Enable-share-intent.patch
 Site-setting-for-images.patch
-Bromite-auto-updater.patch
 Experimental-user-scripts-support.patch
 Enable-native-Android-autofill.patch
 Keep-empty-tabs-between-sessions.patch
@@ -182,3 +181,13 @@ disable-mobile-identity-consistency-by-default.patch
 Disable-idle-detection.patch
 Automated-domain-substitution.patch
 Allow-building-without-supervised-users.patch
+Turn-AdBlock-off-by-default.patch
+Force-tablet-mode.patch
+Set-default-page-url.patch
+change-Android-userAgent-to-deskmode-userAgent.patch
+Force-accessibility-text-scaling.patch
+Force-package-name-to-org.chromium.chrome.patch
+Donot-stretch-when-force-enable-zoom-checked.patch
+Force-desktop-mode.patch
+Telemetry-event-video-full-screen.patch
+

build/patches/Add-option-to-force-tablet-UI.patch

@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -510,6 +510,7 @@ public final class ChromePreferenceKeys {
+@@ -508,6 +508,7 @@ public final class ChromePreferenceKeys {
      public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom";
  
      public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
@@ -101,7 +101,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1354,6 +1354,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1316,6 +1316,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_SAFE_BROWSING_NO_PROTECTION_CONFIRMATION_DIALOG_CONFIRM" desc="Message for Safe Browsing no protection confirmation button.">
          Turn off
        </message>

build/patches/Donot-stretch-when-force-enable-zoom-checked.patch

@@ -15,9 +15,9 @@ Refer to: https://prometheanworld.atlassian.net/browse/AP9-2791
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2760,9 +2760,9 @@
+@@ -2849,9 +2849,9 @@
  #if defined(OS_ANDROID)
-   for (FrameTreeNode* node : frame_tree_.Nodes()) {
+   for (FrameTreeNode* node : primary_frame_tree_.Nodes()) {
      RenderFrameHostImpl* rfh = node->current_frame_host();
      if (rfh->is_local_root()) {
        if (auto* rwh = rfh->GetRenderWidgetHost())
@@ -49,16 +49,15 @@ diff --git a/chrome/android/java/res/xml/accessibility_preferences.xml b/chrome/
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -37,7 +37,7 @@
+@@ -36,6 +36,6 @@
      static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
-     static final String PREF_ACCESSIBILITY_PAGE_ZOOM = "accessibility_page_zoom";
 
      static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
      private TextScalePreference mTextScalePref;
 -    private ChromeBaseCheckBoxPreference mForceEnableZoomPref;
 +    //private ChromeBaseCheckBoxPreference mForceEnableZoomPref;
      private boolean mRecordFontSizeChangeOnStop;
-@@ -45,11 +45,11 @@
+@@ -44,11 +44,11 @@
      private FontSizePrefsObserver mFontSizePrefsObserver = new FontSizePrefsObserver() {
          @Override
          public void onFontScaleFactorChanged(float fontScaleFactor, float userFontScaleFactor) {
@@ -71,7 +70,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 +            //mForceEnableZoomPref.setChecked(enabled);
          }
      };
-@@ -69,11 +69,11 @@
+@@ -68,11 +68,11 @@
          mTextScalePref = (TextScalePreference) findPreference(PREF_TEXT_SCALE);
          mTextScalePref.setOnPreferenceChangeListener(this);
          mTextScalePref.updateFontScaleFactors(mFontSizePrefs.getFontScaleFactor(),

build/patches/Force-accessibility-text-scaling.patch

@@ -11,7 +11,7 @@ This ensures that when we set text scaling, it will work on all web pages.
 diff --git a/third_party/blink/renderer/core/layout/text_autosizer.cc b/third_party/blink/renderer/core/layout/text_autosizer.cc
 --- a/third_party/blink/renderer/core/layout/text_autosizer.cc
 +++ b/third_party/blink/renderer/core/layout/text_autosizer.cc
-@@ -668,14 +668,14 @@
+@@ -672,14 +672,14 @@
      // TODO(pdr): pageNeedsAutosizing should take into account whether
      // text-size-adjust is used anywhere on the page because that also needs to
      // trigger autosizing. See: crbug.com/646237.
@@ -27,7 +27,7 @@ diff --git a/third_party/blink/renderer/core/layout/text_autosizer.cc b/third_pa
    }
 
    if (page_info_.page_needs_autosizing_) {
-@@ -1208,23 +1208,21 @@
+@@ -1209,23 +1209,21 @@
  void TextAutosizer::ApplyMultiplier(LayoutObject* layout_object,
                                      float multiplier,
                                      SubtreeLayoutScope* layouter,

build/patches/Force-package-name-to-org.chromium.chrome.patch

@@ -12,26 +12,27 @@ AndroidManifest.xml to determine the windowing state of the app.
 
 Done for AP9-2571
 ---
- chrome/android/BUILD.gn | 9 ---------
- 1 file changed, 9 deletions(-)
+ chrome/android/BUILD.gn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 index 62fea240ee53d..6387769c4a3ad 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -45,15 +45,6 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
+@@ -44,15 +44,15 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
+ }
+
+-_default_package = "org.bromite.bromite"
++_default_package = "org.chromium.chrome"
+ if (android_channel != "default" && android_channel != "stable") {
+   # android-binary-size trybot may checks if an internal Chrome variant's
+   # AndroidManifest is as expected by ensuring the differences between its
+   # AndroidManifest and its upstream target's .AndroidManifest.expected file
+   # are as expected. Upstream targets having a "org.chromium.chrome" package
+   # name will cause the comparison to output many unnecessary differences.
+   # See https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/README.md
+   _default_package += "." + android_channel
  }
- 
- _default_package = "org.chromium.chrome"
--if (android_channel != "default") {
--  # android-binary-size trybot may checks if an internal Chrome variant's
--  # AndroidManifest is as expected by ensuring the differences between its
--  # AndroidManifest and its upstream target's .AndroidManifest.expected file
--  # are as expected. Upstream targets having a "org.chromium.chrome" package
--  # name will cause the comparison to output many unnecessary differences.
--  # See https://source.chromium.org/chromium/chromium/src/+/main:chrome/android/java/README.md
--  _default_package += "." + android_channel
--}
  
  declare_args() {
    # Android package name to use when compiling the public chrome targets

build/patches/Set-default-page-url.patch

@@ -14,12 +14,12 @@ The requirement is that it should load to http://myPromethean.com when the follo
 diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/util/UrlConstants.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/util/UrlConstants.java
 --- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/util/UrlConstants.java
 +++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/util/UrlConstants.java
-@@ -48,4 +48,4 @@
+@@ -46,4 +46,4 @@
      public static final String NTP_HOST = "newtab";
 -    public static final String NTP_URL = "chrome-native://newtab/";
 -    public static final String NTP_NON_NATIVE_URL = "chrome://newtab/";
-+    public static final String NTP_URL = "http://myPromethean.com/";
-+    public static final String NTP_NON_NATIVE_URL = "http://myPromethean.com/";
++    public static final String NTP_URL = "https://myPromethean.com/";
++    public static final String NTP_NON_NATIVE_URL = "https://myPromethean.com/";
      public static final String NTP_ABOUT_URL = "about:newtab";
 --
 2.17.1

build/patches/Telemetry-event-video-full-screen.patch

@@ -19,8 +19,8 @@ Jira Ticket: https://prometheanworld.atlassian.net/browse/AP9-3128
  chrome/android/java/src/org/chromium/chrome/browser/base/SplitMonochromeApplication.java | 24 ++++++++++++++++++++++++
  chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java | 9 +++++++++
  third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy | 15 +++++++++++++++
- third_party/r8/desugar_jdk_libs.json | 168 ---
- 7 files changed, 58 insertions(+), 168 deletion(-)
+ third_party/r8/desugar_jdk_libs.json | 164 ---
+ 7 files changed, 58 insertions(+), 164 deletion(-)
 
 diff --git a/third_party/android_deps/build.gradle b/third_party/android_deps/build.gradle
 --- a/third_party/android_deps/build.gradle
@@ -36,22 +36,22 @@ diff --git a/third_party/android_deps/build.gradle b/third_party/android_deps/bu
  }
 
  dependencyCheck {
-@@ -117,7 +119,10 @@
-     compile 'com.google.guava:guava:30.1-android'
-
+@@ -115,7 +117,10 @@
      // Needed by androidx.
-     compile 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
+     String kotlinxVersion = '1.5.0'
+     compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kotlinxVersion}"
+     compile "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:${kotlinxVersion}"
+
 
 +    // promethean telemetry
 +    compile 'com.prometheanworld:telemetry:0.3.3'
 +
-     // buildCompile targets have supports_android = false.
-     buildCompile 'com.google.guava:guava:30.1-jre'
+     // Upstream guava introduced versions with -android suffix starting with version
 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
 @@ -1284,6 +1284,10 @@ by a child template that "extends" this file.
-           tools:ignore="ExportedContentProvider">
+                   android:readPermission="android.permission.GLOBAL_SEARCH" />
        </provider>
 
 +      <meta-data
@@ -64,7 +64,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -172,6 +172,7 @@ android_resources("chrome_base_module_resources") {
+@@ -180,6 +180,7 @@ android_resources("chrome_base_module_resources") {
      "java/res_chromium_base/mipmap-xxxhdpi/app_icon.png",
      "java/res_chromium_base/values/channel_constants.xml",
    ]
@@ -72,7 +72,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
  }
 
  android_resources("chrome_app_java_resources") {
-@@ -2455,6 +2456,7 @@ android_library("base_module_java") {
+@@ -2518,6 +2519,7 @@ android_library("base_module_java") {
      "java/src/org/chromium/chrome/browser/tracing/TracingNotificationService.java",
    ]
    deps = [
@@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Full
 +import org.json.JSONObject;
 
  import java.lang.ref.WeakReference;
-@@ -495,4 +498,10 @@
+@@ -500,4 +503,10 @@
          mWebContentsInFullscreen = webContents;
          mContentViewInFullscreen = contentView;
          mTabInFullscreen = tab;
@@ -163,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Full
 diff --git a/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy b/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
 --- a/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
 +++ b/third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
-@@ -864,6 +864,21 @@ class BuildConfigGenerator extends DefaultTask {
+@@ -890,6 +890,21 @@ class BuildConfigGenerator extends DefaultTask {
                  sb.append('  # this for other purposes, change buildCompileNoDeps in build.gradle.\n')
                  sb.append('  visibility = [ "//build/android/unused_resources:*" ]\n')
                  break
@@ -251,7 +251,7 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
        ]
      }
    ],
-@@ -73,82 +22,25 @@
+@@ -73,81 +22,25 @@
      {
        "api_level_below_or_equal": 25,
        "rewrite_prefix": {
@@ -300,7 +300,6 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
 -        "java.util.StringJoiner": "j$.util.StringJoiner",
 -        "java.util.Tripwire": "j$.util.Tripwire",
 -        "java.util.concurrent.DesugarUnsafe": "j$.util.concurrent.DesugarUnsafe",
--        "java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom",
 -        "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic"
        },
        "retarget_lib_member": {
@@ -334,7 +333,7 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
        }
      }
    ],
-@@ -156,83 +48,23 @@
+@@ -155,80 +48,23 @@
      {
        "api_level_below_or_equal": 25,
        "rewrite_prefix": {
@@ -370,7 +369,6 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
 -        "java.util.PrimitiveIterator": "j$.util.PrimitiveIterator",
 -        "java.util.Spliterator": "j$.util.Spliterator",
 -        "java.util.StringJoiner": "j$.util.StringJoiner",
--        "java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom",
 -        "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic"
        },
        "retarget_lib_member": {
@@ -388,9 +386,7 @@ diff --git a/third_party/r8/desugar_jdk_libs.json b/third_party/r8/desugar_jdk_l
 -        "java.util.concurrent.atomic.AtomicReference#getAndUpdate": "java.util.concurrent.atomic.DesugarAtomicReference",
 -        "java.util.concurrent.atomic.AtomicReference#updateAndGet": "java.util.concurrent.atomic.DesugarAtomicReference",
 -        "java.util.concurrent.atomic.AtomicReference#getAndAccumulate": "java.util.concurrent.atomic.DesugarAtomicReference",
--        "java.util.concurrent.atomic.AtomicReference#accumulateAndGet": "java.util.concurrent.atomic.DesugarAtomicReference",
--        "java.util.Collections#synchronizedMap": "java.util.DesugarCollections",
--        "java.util.Collections#synchronizedSortedMap": "java.util.DesugarCollections"
+-        "java.util.concurrent.atomic.AtomicReference#accumulateAndGet": "java.util.concurrent.atomic.DesugarAtomicReference"
        },
        "dont_rewrite": [
 -        "java.util.Iterator#remove"

build/patches/Turn-AdBlock-off-by-default.patch

@@ -19,7 +19,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 index 6fff875f9c525..0a32f68f25a82 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -356,7 +356,7 @@ void ContentSettingsRegistry::Init() {
+@@ -339,7 +339,7 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
  
    Register(ContentSettingsType::ADS, "subresource-filter",

build/patches/change-Android-userAgent-to-deskmode-userAgent.patch

@@ -11,8 +11,8 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
 index 6d76b0ef5de5e..e6d3dfa27d831 100644
 --- a/content/common/user_agent.cc
 +++ b/content/common/user_agent.cc
-@@ -37,7 +37,7 @@ std::string GetUserAgentPlatform() {
- #elif defined(USE_X11) || defined(USE_OZONE)
+@@ -36,7 +36,7 @@ std::string GetUserAgentPlatform() {
+ #elif defined(USE_OZONE)
    return "X11; ";  // strange, but that's what Firefox uses
  #elif defined(OS_ANDROID)
 -  return "Linux; ";
@@ -20,18 +20,18 @@ index 6d76b0ef5de5e..e6d3dfa27d831 100644
  #elif defined(OS_FUCHSIA)
    // TODO(https://crbug.com/1225812): Determine what to report for Fuchsia,
    // considering both backwards compatibility and User-Agent Reduction.
-@@ -50,9 +50,7 @@ std::string GetUserAgentPlatform() {
+@@ -49,9 +49,7 @@ std::string GetUserAgentPlatform() {
  }  // namespace
  
  std::string GetUnifiedPlatform() {
 -#if defined(OS_ANDROID)
 -  return frozen_user_agent_strings::kUnifiedPlatformAndroid;
--#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+-#elif defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS)
    return frozen_user_agent_strings::kUnifiedPlatformCrOS;
  #elif defined(OS_MAC)
    return frozen_user_agent_strings::kUnifiedPlatformMacOS;
-@@ -216,7 +214,7 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(const std::string& os_version,
+@@ -218,7 +216,7 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(const std::string& os_version,
                                                    const std::string& cpu_type) {
    std::string os_cpu;
  
@@ -40,7 +40,7 @@ index 6d76b0ef5de5e..e6d3dfa27d831 100644
    // Should work on any Posix system.
    struct utsname unixinfo;
    uname(&unixinfo);
-@@ -238,7 +236,9 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(const std::string& os_version,
+@@ -241,7 +239,9 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(const std::string& os_version,
                        cpu_type.c_str(),  // e.g. i686
                        os_version.c_str()
  #elif defined(OS_ANDROID)
@@ -51,7 +51,7 @@ index 6d76b0ef5de5e..e6d3dfa27d831 100644
  #elif defined(OS_FUCHSIA)
                        "Fuchsia"
  #elif defined(OS_POSIX)
-@@ -254,20 +254,9 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(const std::string& os_version,
+@@ -257,20 +257,9 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(const std::string& os_version,
  
  std::string GetReducedUserAgent(bool mobile, std::string major_version) {
    std::string user_agent;
@@ -72,7 +72,7 @@ index 6d76b0ef5de5e..e6d3dfa27d831 100644
    return user_agent;
  }
  
-@@ -292,10 +281,10 @@ std::string BuildUserAgentFromProductAndExtraOSInfo(
+@@ -300,10 +289,10 @@ std::string BuildUserAgentFromProductAndExtraOSInfo(
      const std::string& extra_os_info,
      IncludeAndroidBuildNumber include_android_build_number) {
    std::string os_info;
@@ -87,7 +87,7 @@ index 6d76b0ef5de5e..e6d3dfa27d831 100644
    return BuildUserAgentFromOSAndProduct(os_info, product);
  }
  
-@@ -337,7 +326,7 @@ std::string BuildUserAgentFromOSAndProduct(const std::string& os_info,
+@@ -345,7 +334,7 @@ std::string BuildUserAgentFromOSAndProduct(const std::string& os_info,
    base::StringAppendF(&user_agent,
                        "Mozilla/5.0 (%s) AppleWebKit/537.36 (KHTML, like Gecko) "
                        "%s Safari/537.36",