BASELINE: Update Chromium to 98.0.4758.90

Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 58 insertions, 2 deletions

diff --git a/chromium/chrome/app/BUILD.gn b/chromium/chrome/app/BUILD.gn
index 84b98d0874b..1ec0f190614 100644
--- a/chromium/chrome/app/BUILD.gn
+++ b/chromium/chrome/app/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chrome_build.gni")
 import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
@@ -73,6 +74,17 @@ if (is_android) {
       process_file_template(
           android_bundle_locales_as_resources,
           [ "java/res/values-{{source_name_part}}/generated_resources.xml" ])
+
+  google_chrome_strings_java_resources =
+      [ "java/res/values/google_chrome_strings.xml" ] +
+      process_file_template(
+          android_bundle_locales_as_resources,
+          [ "java/res/values-{{source_name_part}}/google_chrome_strings.xml" ])
+  chromium_strings_java_resources =
+      [ "java/res/values/chromium_strings.xml" ] +
+      process_file_template(
+          android_bundle_locales_as_resources,
+          [ "java/res/values-{{source_name_part}}/chromium_strings.xml" ])
 }
 
 grit("generated_resources") {
@@ -97,6 +109,15 @@ if (is_android) {
     generated_files =
         rebase_path(android_generated_java_resources, "java/res", ".")
     deps = [ ":generated_resources" ]
+    if (is_chrome_branded) {
+      generated_files +=
+          rebase_path(google_chrome_strings_java_resources, "java/res", ".")
+      deps += [ ":google_chrome_strings" ]
+    } else {
+      generated_files +=
+          rebase_path(chromium_strings_java_resources, "java/res", ".")
+      deps += [ ":chromium_strings" ]
+    }
   }
 }
 
@@ -108,6 +129,10 @@ grit("google_chrome_strings") {
             process_file_template(
                 locales_with_pseudolocales,
                 [ "google_chrome_strings_{{source_name_part}}.pak" ])
+
+  if (is_android) {
+    outputs += google_chrome_strings_java_resources
+  }
 }
 
 grit("chromium_strings") {
@@ -118,6 +143,10 @@ grit("chromium_strings") {
       [ "grit/chromium_strings.h" ] +
       process_file_template(locales_with_pseudolocales,
                             [ "chromium_strings_{{source_name_part}}.pak" ])
+
+  if (is_android) {
+    outputs += chromium_strings_java_resources
+  }
 }
 
 static_library("test_support") {
@@ -153,6 +182,7 @@ static_library("test_support") {
     "//ui/base",
     "//v8:v8_headers",
   ]
+  public_deps = []
 
   if (!is_fuchsia) {
     # TODO(crbug.com/1226159): Complete crash reporting integration on Fuchsia.
@@ -188,12 +218,14 @@ static_library("test_support") {
       "//chromeos",
       "//chromeos/memory:memory",
     ]
+    public_deps += [ "//ui/lottie" ]
   }
 
   if (is_chromeos_lacros) {
     deps += [
       "//chromeos/crosapi/mojom",
       "//chromeos/lacros",
+      "//chromeos/lacros/dbus",
     ]
   }
 
@@ -231,10 +263,34 @@ if (is_fuchsia) {
       ":chrome_component",
       ":chrome_component_v1",
     ]
+
+    excluded_dirs = FUCHSIA_PACKAGED_CONTENT_EMBEDDER_EXCLUDED_DIRS
   }
 
-  fuchsia_package_runner("chrome_fuchsia") {
+  fuchsia_package_installer("chrome_fuchsia_installer") {
     package = ":chrome_pkg"
-    package_name_override = "chrome"
+    package_name = "chrome"
+  }
+
+  fuchsia_run_script_with_packages("chrome_fuchsia_runner") {
+    package = ":chrome_pkg"
+    package_name = "chrome"
+    output_name_format = "run_%package%"
+
+    executable = rebase_path("//build/fuchsia/run_ffx_command.py")
+    executable_args = [
+      "--command",
+      "session add fuchsia-pkg://fuchsia.com/chrome#meta/chrome_v1.cmx",
+
+      # TODO(bugs.fuchsia.dev/85949): Pass runtime arguments using %args%.
+    ]
+    include_fuchsia_build_dir = true
+  }
+
+  group("chrome_fuchsia") {
+    deps = [
+      ":chrome_fuchsia_installer",
+      ":chrome_fuchsia_runner",
+    ]
   }
 }