Update Chromium Webview to 132.0.6834.122

Change-Id: I57626fc67caeee66efcff5c8ba1a19ec92c51db3

Author: haggertk

0001-Add-support-for-getting-updates-for-theme-color-chan.patch

@@ -1,7 +1,7 @@
-From a77522150922a24e2a5dccb7e0c1e751d3a7a014 Mon Sep 17 00:00:00 2001
+From b7af77d0fd2cf9ab18c1563e7b558de565cdf8b6 Mon Sep 17 00:00:00 2001
 From: Danny Baumann <dannybaumann@web.de>
 Date: Thu, 18 May 2017 11:04:40 +0200
-Subject: [PATCH 01/13] Add support for getting updates for theme color
+Subject: [PATCH 01/12] Add support for getting updates for theme color
  changes.
 
 ---
@@ -48,10 +48,10 @@ index a03aa4cb833d3..83c6470e1021e 100644
      public int getContentHeight() {
          try (TraceEvent event = TraceEvent.scoped("WebView.APICall.Framework.GET_CONTENT_HEIGHT")) {
 diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
-index ca112dd360d3d..380dcb6d8f0c2 100644
+index 7ef4a39026987..ad6015737b4cb 100644
 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
 +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
-@@ -62,6 +62,8 @@ import org.chromium.components.embedder_support.util.WebResourceResponseInfo;
+@@ -63,6 +63,8 @@ import org.chromium.components.embedder_support.util.WebResourceResponseInfo;
  import org.chromium.content_public.browser.util.DialogTypeRecorder;
 
  import java.lang.ref.WeakReference;
@@ -60,7 +60,7 @@ index ca112dd360d3d..380dcb6d8f0c2 100644
  import java.security.Principal;
  import java.security.PrivateKey;
  import java.security.cert.X509Certificate;
-@@ -111,6 +113,9 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
+@@ -112,6 +114,9 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
      private static final Pattern FILE_ANDROID_ASSET_PATTERN =
              Pattern.compile("^file:/*android_(asset|res).*");
 
@@ -70,7 +70,7 @@ index ca112dd360d3d..380dcb6d8f0c2 100644
      /**
       * Adapter constructor.
       *
-@@ -122,6 +127,17 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
+@@ -123,6 +128,17 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
          super(webView, webViewDelegate, context);
          try (ScopedSysTraceEvent event =
                  ScopedSysTraceEvent.scoped("WebView.APICallback.WebViewClient.constructor")) {
@@ -88,7 +88,7 @@ index ca112dd360d3d..380dcb6d8f0c2 100644
              // See //android_webview/docs/how-does-on-create-window-work.md for more details.
              mUiThreadHandler =
                      new Handler() {
-@@ -1089,6 +1105,24 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
+@@ -1090,6 +1106,24 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
          }
      }
 
@@ -211,5 +211,5 @@ index be8f554e3930e..7e2e11de7b3db 100644
      public WebResourceResponseInfo shouldInterceptRequest(
              AwContentsClient.AwWebResourceRequest request) {
 -- 
-2.47.1
+2.48.1
 

0002-Add-xxxhdpi-icon_webview.png-to-BUILD.gn.patch

@@ -1,7 +1,7 @@
-From 383852d2b9882e4126b1250629437b8447d0f83d Mon Sep 17 00:00:00 2001
+From 20f07ef28d36c430d6bf50da17db2bac7b0797b3 Mon Sep 17 00:00:00 2001
 From: "Kevin F. Haggerty" <haggertk@lineageos.org>
 Date: Tue, 19 May 2020 17:21:42 -0600
-Subject: [PATCH 02/13] Add xxxhdpi icon_webview.png to BUILD.gn
+Subject: [PATCH 02/12] Add xxxhdpi icon_webview.png to BUILD.gn
 
 ---
  android_webview/nonembedded/BUILD.gn | 1 +
@@ -20,5 +20,5 @@ index 7f710b1747102..cc28b07a0f33e 100644
  }
 
 -- 
-2.47.1
+2.48.1
 

0003-webview-Hard-no-to-persistent-histograms.patch

@@ -1,7 +1,7 @@
-From 0e93eaaf1d7dd972c192dd08d5e4ba6d1750d373 Mon Sep 17 00:00:00 2001
+From 38d62b4d7e75e51f56ead1d5b54fa57d49254b2e Mon Sep 17 00:00:00 2001
 From: "Kevin F. Haggerty" <haggertk@lineageos.org>
 Date: Sun, 27 Dec 2020 09:42:54 -0700
-Subject: [PATCH 03/13] webview: Hard no to persistent histograms
+Subject: [PATCH 03/12] webview: Hard no to persistent histograms
 
 * It's probably some kind of bug somewhere that these are never
   deleted, but they don't really add value to us in the first
@@ -15,18 +15,18 @@ Subject: [PATCH 03/13] webview: Hard no to persistent histograms
  1 file changed, 2 insertions(+)
 
 diff --git a/android_webview/browser/aw_field_trials.cc b/android_webview/browser/aw_field_trials.cc
-index 73641807044ad..0db485266564e 100644
+index 4ab726d305039..b5d7e96453342 100644
 --- a/android_webview/browser/aw_field_trials.cc
 +++ b/android_webview/browser/aw_field_trials.cc
-@@ -92,6 +92,7 @@ class AwFeatureOverrides {
+@@ -94,6 +94,7 @@ class AwFeatureOverrides {
  }  // namespace
 
  void AwFieldTrials::OnVariationsSetupComplete() {
 +#if 0
    // Persistent histograms must be enabled ASAP, but depends on Features.
    base::FilePath metrics_dir;
    if (base::PathService::Get(base::DIR_ANDROID_APP_DATA, &metrics_dir)) {
-@@ -99,6 +100,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
+@@ -101,6 +102,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
    } else {
      NOTREACHED();
    }
@@ -35,5 +35,5 @@ index 73641807044ad..0db485266564e 100644
 
  // TODO(crbug.com/40271903): Consider to migrate all WebView feature overrides
 -- 
-2.47.1
+2.48.1
 

0004-disable-autofill-server-communication-by-default.patch

@@ -1,17 +1,17 @@
-From a27770aa5c9f8f8e05fbd0e85cd4361cde6c014f Mon Sep 17 00:00:00 2001
+From ddbb952bfe5d894ad852f1ecf40578457a8856d5 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Tue, 1 Dec 2020 00:56:57 -0500
-Subject: [PATCH 04/13] disable autofill server communication by default
+Subject: [PATCH 04/12] disable autofill server communication by default
 
 ---
  components/autofill/core/common/autofill_features.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
-index 8e616f6b72a0a..6504fca4a8d33 100644
+index 6783e2c63d688..a5f6e6aeae4ae 100644
 --- a/components/autofill/core/common/autofill_features.cc
 +++ b/components/autofill/core/common/autofill_features.cc
-@@ -847,7 +847,7 @@ const base::FeatureParam<std::string>
+@@ -820,7 +820,7 @@ const base::FeatureParam<std::string>
  // i.e., https://other.autofill.server:port/tbproxy/af/
  BASE_FEATURE(kAutofillServerCommunication,
               "AutofillServerCommunication",
@@ -21,5 +21,5 @@ index 8e616f6b72a0a..6504fca4a8d33 100644
  // Controls attaching the autofill type predictions to their respective
  // element in the DOM.
 -- 
-2.47.1
+2.48.1
 

0005-webview-Disable-autofill-metadata-uploads-by-default.patch

@@ -1,7 +1,7 @@
-From b8ad19c93d6864ee6c9431e9c98ea7fa2d5d52ff Mon Sep 17 00:00:00 2001
+From f34fe35f58f9d77d9c17c8f93a8e6aaaf706e910 Mon Sep 17 00:00:00 2001
 From: "Kevin F. Haggerty" <haggertk@lineageos.org>
 Date: Tue, 28 Sep 2021 08:43:01 -0600
-Subject: [PATCH 05/13] webview: Disable autofill metadata uploads by default
+Subject: [PATCH 05/12] webview: Disable autofill metadata uploads by default
 
 * [haggertk - 2021-11-16] - Update per d85f6c03db147
   (Reland "[Autofill] Inline kAutofillMetadataUploads")
@@ -10,7 +10,7 @@ Subject: [PATCH 05/13] webview: Disable autofill metadata uploads by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/autofill/core/browser/randomized_encoder.cc b/components/autofill/core/browser/randomized_encoder.cc
-index 201ecfe1eaa3b..f49a7bc22e8ae 100644
+index b92a466b3381b..66440df0bd034 100644
 --- a/components/autofill/core/browser/randomized_encoder.cc
 +++ b/components/autofill/core/browser/randomized_encoder.cc
 @@ -188,7 +188,7 @@ const char RandomizedEncoder::kUrlKeyedAnonymizedDataCollectionEnabled[] =
@@ -23,5 +23,5 @@ index 201ecfe1eaa3b..f49a7bc22e8ae 100644
    }
 
 -- 
-2.47.1
+2.48.1
 

0006-disable-WebView-variations-support.patch

@@ -1,15 +1,15 @@
-From c1d257bdd7615f914a72b210f35cf591e0cc4279 Mon Sep 17 00:00:00 2001
+From 6ab3b8f17ed3ee7f8146ea92224c6383b7110640 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 10 Dec 2020 10:09:18 -0500
-Subject: [PATCH 06/13] disable WebView variations support
+Subject: [PATCH 06/12] disable WebView variations support
 
 ---
  .../com/android/webview/chromium/WebViewChromiumAwInit.java | 6 ------
  .../webview/chromium/WebViewChromiumFactoryProvider.java    | 4 ----
  2 files changed, 10 deletions(-)
 
 diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
-index d29791a711736..d486d2b49c3e7 100644
+index 41d018cdfecf2..bdd270f9f97ac 100644
 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
 +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
 @@ -249,12 +249,6 @@ public class WebViewChromiumAwInit {
@@ -26,7 +26,7 @@ index d29791a711736..d486d2b49c3e7 100644
 
              // TODO(crbug.com/332706093): See if this can be moved before loading native.
 diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
-index a96d6c75b7130..2dbf906d9b5c9 100644
+index 63c5f5a5b2795..f961388d11e67 100644
 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
 +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
 @@ -522,10 +522,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
@@ -41,5 +41,5 @@ index a96d6c75b7130..2dbf906d9b5c9 100644
 
              setSingleton(this);
 -- 
-2.47.1
+2.48.1
 

0007-disable-component-updater-pings-by-default.patch

@@ -1,7 +1,7 @@
-From b87644a118dad4e26c284e7e9f1187d62dc0df33 Mon Sep 17 00:00:00 2001
+From 0acd40d2e4ba6cd7c4ba8716e4302863d323fb38 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Fri, 27 Nov 2020 03:56:29 -0500
-Subject: [PATCH 07/13] disable component updater pings by default
+Subject: [PATCH 07/12] disable component updater pings by default
 
 ---
  .../component_updater_command_line_config_policy.h              | 2 +-
@@ -21,5 +21,5 @@ index 6c16b4e37a753..a627cb7ffd59c 100644
 
    // If non-zero, time interval until the first component update check.
 -- 
-2.47.1
+2.48.1
 

0008-Revert-Allow-uses-library-android.ext.adservices.patch

@@ -1,7 +1,7 @@
-From b4262a143142f6be9526eb52c04e2ecd157e0d75 Mon Sep 17 00:00:00 2001
+From 3b139b199bbbde8e6bc80c9b4e692dc7c49443c0 Mon Sep 17 00:00:00 2001
 From: "Kevin F. Haggerty" <haggertk@lineageos.org>
 Date: Sat, 2 Mar 2024 08:55:45 -0700
-Subject: [PATCH 08/13] Revert "Allow uses-library android.ext.adservices"
+Subject: [PATCH 08/12] Revert "Allow uses-library android.ext.adservices"
 
 This reverts commit 0c3ae92dd16b763625a4d8c3f05012d9813dee2d.
 ---
@@ -233,5 +233,5 @@ index 03b231888adc3..5a2773db2739b 100644
        # Keeps emoji2 code. See http://crbug.com/1205141
        ignore_proguard_configs = true
 -- 
-2.47.1
+2.48.1
 

0009-bromite-build-utils.patch

@@ -1,7 +1,7 @@
-From 0ed683790b9d5277d180785ad3d8ab42ddb55602 Mon Sep 17 00:00:00 2001
+From a04946e55a072e652f2b3716e058729152664ffe Mon Sep 17 00:00:00 2001
 From: uazo <uazo@users.noreply.github.com>
 Date: Fri, 9 Jun 2023 15:11:46 +0000
-Subject: [PATCH 09/13] bromite build utils
+Subject: [PATCH 09/12] bromite build utils
 
 Change-Id: I341ca819f305782864b36de15b42e2da3849897d
 ---
@@ -433,10 +433,10 @@ index 0000000000000..cfaccd9373e45
 +../../zip_helpers.py
 +java_bromite_impl.py
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index c9a3ce41465b3..b35add9bb3222 100644
+index 8e0c3761f1634..388d7bdb358ce 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
-@@ -728,6 +728,7 @@ set_defaults("component") {
+@@ -734,6 +734,7 @@ set_defaults("component") {
    configs = default_component_configs
  }
 
@@ -445,10 +445,10 @@ index c9a3ce41465b3..b35add9bb3222 100644
  # ACTION OVERRIDE
  # =============================================================================
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
-index aa6a2fe716646..47261d84d6152 100644
+index 053550dd0365d..c568dc99495de 100644
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
-@@ -208,7 +208,7 @@ if (!is_robolectric && enable_java_templates) {
+@@ -209,7 +209,7 @@ if (!is_robolectric && enable_java_templates) {
    #   }
    template("java_cpp_enum") {
      action_with_pydeps(target_name) {
@@ -457,7 +457,7 @@ index aa6a2fe716646..47261d84d6152 100644
 
        # The sources aren't compiled so don't check their dependencies.
        check_includes = false
-@@ -219,6 +219,10 @@ if (!is_robolectric && enable_java_templates) {
+@@ -220,6 +220,10 @@ if (!is_robolectric && enable_java_templates) {
        _rebased_sources = rebase_path(invoker.sources, root_build_dir)
 
        args = [ "--srcjar=$_rebased_srcjar_path" ] + _rebased_sources
@@ -604,15 +604,15 @@ index 0000000000000..db44defd1ecb8
 +#endif  // CHROME_BROWSER_FLAGS_ANDROID_CROMITE_NATIVE_UTILS_H_
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CromiteNativeUtils.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CromiteNativeUtils.java
 new file mode 100755
-index 0000000000000..d01ecbc5428f7
+index 0000000000000..702fe4dce42f0
 --- /dev/null
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CromiteNativeUtils.java
 @@ -0,0 +1,46 @@
 +package org.chromium.chrome.browser.flags;
 +
-+import org.chromium.base.cached_flags.CachedFlag;
++import org.chromium.components.cached_flags.CachedFlagsSharedPreferences;
++import org.chromium.components.cached_flags.CachedFlag;
 +import org.chromium.chrome.browser.flags.ChromeFeatureList;
-+import org.chromium.base.cached_flags.CachedFlagsSharedPreferences;
 +
 +import org.jni_zero.CalledByNative;
 +import org.jni_zero.NativeMethods;
@@ -655,7 +655,7 @@ index 0000000000000..d01ecbc5428f7
 +    }
 +}
 diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/mojom_parser.py
-index 039c7464268f0..0ddfb753b92d6 100755
+index 28c74c9e4ca17..0b167716212ec 100755
 --- a/mojo/public/tools/mojom/mojom_parser.py
 +++ b/mojo/public/tools/mojom/mojom_parser.py
 @@ -21,6 +21,7 @@ import os
@@ -666,12 +666,12 @@ index 039c7464268f0..0ddfb753b92d6 100755
  from collections import defaultdict
 
  from mojom.generate import module
-@@ -176,11 +177,26 @@ def _CollectAllowedImportsFromBuildMetadata(build_metadata_filename):
+@@ -177,11 +178,26 @@ def _CollectAllowedImportsFromBuildMetadata(build_metadata_filename):
    collect(build_metadata_filename)
    return allowed_imports
 
 +def _ResolveInclude(mojom_abspath, input_root_paths):
-+  mojom_abspath = _ResolveRelativeImportPath(mojom_abspath, input_root_paths)
++  mojom_abspath = _ResolveRelativeImportPath(mojom_abspath, mojom_abspath, input_root_paths)
 +  with codecs.open(mojom_abspath, encoding='utf-8') as f:
 +    src = f.read()
 +
@@ -695,7 +695,7 @@ index 039c7464268f0..0ddfb753b92d6 100755
      conditional_features.RemoveDisabledDefinitions(ast, enabled_features)
      return mojom_abspath, ast
 
-@@ -300,7 +316,7 @@ def _ParseMojoms(mojom_files,
+@@ -301,7 +317,7 @@ def _ParseMojoms(mojom_files,
        (path, abs_path) for abs_path, path in mojom_files_to_parse.items())
 
    logging.info('Parsing %d .mojom into ASTs', len(mojom_files_to_parse))
@@ -800,5 +800,5 @@ index 35c1b20bc2c83..6a600ee42da7b 100644
      removal_comments_extension = None  # None means no removal comments
      if args.enable_removal_comments:
 -- 
-2.47.1
+2.48.1