Update build from Chromium 114.0.5735.331 (#2207)

b/313662336

build/android/docs/coverage.md

@@ -29,10 +29,6 @@ class files and runtime **.exec** files. Then we need to process them using the
 3. The coverage results of JUnit and instrumentation tests will be merged
    automatically if they are in the same directory.
 
-4. If generating coverage and there are duplicate class files, as can happen
-   when generating coverage for downstream targets, use the
-   --include-substr-filter option to choose jars in the desired directory.
-
 ## How to generate coverage report
 
 1. Now we have generated .exec files already. We can create a JaCoCo HTML/XML/CSV

build/android/pylib/gtest/gtest_test_instance_test.py

@@ -312,37 +312,6 @@ def testParseGTestJSON_skippedTest_example(self):
                      actual[0].GetName())
     self.assertEqual(base_test_result.ResultType.SKIP, actual[0].GetType())
 
-  def testParseGTestJSON_skippedTest_example(self):
-    raw_json = """
-      {
-        "tests": {
-          "mojom_tests": {
-            "parse": {
-              "ast_unittest": {
-                "ASTTest": {
-                  "testNodeBase": {
-                    "expected": "SKIP",
-                    "actual": "SKIP",
-                  }
-                }
-              }
-            }
-          }
-        },
-        "interrupted": false,
-        "path_delimiter": ".",
-        "version": 3,
-        "seconds_since_epoch": 1406662283.764424,
-        "num_failures_by_type": {
-          "SKIP": 1
-        },
-      }"""
-    actual = gtest_test_instance.ParseGTestJSON(raw_json)
-    self.assertEquals(1, len(actual))
-    self.assertEquals('mojom_tests.parse.ast_unittest.ASTTest.testNodeBase',
-                      actual[0].GetName())
-    self.assertEquals(base_test_result.ResultType.SKIP, actual[0].GetType())
-
   def testTestNameWithoutDisabledPrefix_disabled(self):
     test_name_list = [
       'A.DISABLED_B',

build/android/pylib/local/device/local_device_test_run.py

@@ -99,13 +99,6 @@ def run_tests_on_device(dev, tests, results):
           # of bad device detection.
           consecutive_device_errors = 0
 
-          # TODO(crbug.com/1181389): Remove this workaround once the deadlocks
-          # in ArCore are resolved
-          def GetResultTypeForTest(t):
-            if 'WebXrAr' in self._GetUniqueTestName(t):
-              return base_test_result.ResultType.PASS
-            return base_test_result.ResultType.TIMEOUT
-
           if isinstance(test, list):
             results.AddResults(
                 base_test_result.BaseTestResult(

build/android/pylib/results/json_results_test.py

@@ -270,34 +270,6 @@ def testGenerateJsonTestResultFormatDict_skippedResult(self):
     self.assertIn('SKIP', results_dict['num_failures_by_type'])
     self.assertEqual(1, results_dict['num_failures_by_type']['SKIP'])
 
-  def testGenerateJsonTestResultFormatDict_skippedResult(self):
-    result = base_test_result.BaseTestResult('test.package.TestName',
-                                             base_test_result.ResultType.SKIP)
-
-    all_results = base_test_result.TestRunResults()
-    all_results.AddResult(result)
-
-    results_dict = json_results.GenerateJsonTestResultFormatDict([all_results],
-                                                                 False)
-    self.assertEquals(1, len(results_dict['tests']))
-    self.assertEquals(1, len(results_dict['tests']['test']))
-    self.assertEquals(1, len(results_dict['tests']['test']['package']))
-    self.assertEquals(
-        'PASS',
-        results_dict['tests']['test']['package']['TestName']['expected'])
-    self.assertEquals(
-        'FAIL', results_dict['tests']['test']['package']['TestName']['actual'])
-    self.assertEquals(
-        True,
-        results_dict['tests']['test']['package']['TestName']['is_unexpected'])
-
-    self.assertTrue('FAIL' not in results_dict['num_failures_by_type']
-                    or results_dict['num_failures_by_type']['FAIL'] == 0)
-    self.assertTrue('PASS' not in results_dict['num_failures_by_type']
-                    or results_dict['num_failures_by_type']['PASS'] == 0)
-    self.assertIn('SKIP', results_dict['num_failures_by_type'])
-    self.assertEquals(1, results_dict['num_failures_by_type']['SKIP'])
-
   def testGenerateJsonTestResultFormatDict_failedResultWithRetry(self):
     result_1 = base_test_result.BaseTestResult('test.package.TestName',
                                                base_test_result.ResultType.FAIL)

build/config/apple/sdk_info.py

@@ -135,7 +135,7 @@ def main():
                       help='Value of gn $root_build_dir')
   parser.add_argument('platform',
                       choices=['iphoneos', 'iphonesimulator', 'macosx',
-                               'appletvos'])
+                               'appletvos'])  # Cobalt: for internal build
   args = parser.parse_args()
   if args.developer_dir:
     os.environ['DEVELOPER_DIR'] = args.developer_dir

build/config/arm.gni

@@ -53,17 +53,17 @@ if (current_cpu == "arm" || v8_current_cpu == "arm") {
     arm_float_abi = sabi_variables.floating_point_abi
     arm_fpu = sabi_variables.floating_point_fpu
   } else {
-    if (current_os == "android" || target_os == "android") {
-      arm_float_abi = "softfp"
-    } else {
-      declare_args() {
-        # The ARM floating point mode. This is either the string "hard", "soft",
-        # or "softfp". An empty string means to use the default one for the
-        # arm_version.
-        arm_float_abi = ""
-      }
+  if (current_os == "android" || target_os == "android") {
+    arm_float_abi = "softfp"
+  } else {
+    declare_args() {
+      # The ARM floating point mode. This is either the string "hard", "soft",
+      # or "softfp". An empty string means to use the default one for the
+      # arm_version.
+      arm_float_abi = ""
     }
   }
+  }
   assert(arm_float_abi == "" || arm_float_abi == "hard" ||
          arm_float_abi == "soft" || arm_float_abi == "softfp")
 

build/config/clang/clang.gni

@@ -5,7 +5,7 @@
 import("//build/toolchain/toolchain.gni")
 
 if (!use_cobalt_customizations) {
-  default_clang_base_path = "//third_party/llvm-build/Release+Asserts"
+default_clang_base_path = "//third_party/llvm-build/Release+Asserts"
 }
 
 declare_args() {
@@ -21,6 +21,6 @@ declare_args() {
       ((is_linux && !is_castos) || (is_android && !is_cast_android))
 
   if (!use_cobalt_customizations) {
-    clang_base_path = default_clang_base_path
+  clang_base_path = default_clang_base_path
   }
 }

build/config/compiler/BUILD.gn

@@ -1631,14 +1631,13 @@ config("default_warnings") {
       # which we no longer use. Check if it makes sense to remove
       # this as well. http://crbug.com/316352
       "-Wno-unneeded-internal-declaration",
-
-      "-Wno-extra-semi",
-      "-Wno-pessimizing-move",
-      "-Wno-shadow",
     ]
 
     if (use_cobalt_customizations) {
       cflags += [
+        "-Wno-extra-semi",
+        "-Wno-pessimizing-move",
+        "-Wno-shadow",
         "-Wno-range-loop-bind-reference",
         "-Wno-range-loop-construct",
       ]
@@ -1652,13 +1651,13 @@ config("default_warnings") {
       }
 
       if (!use_cobalt_customizations) {
-        cflags += [
-          "-Wenum-compare-conditional",
+      cflags += [
+        "-Wenum-compare-conditional",
 
-          # Ignore warnings about MSVC optimization pragmas.
-          # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
-          "-Wno-ignored-pragma-optimize",
-        ]
+        # Ignore warnings about MSVC optimization pragmas.
+        # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
+        "-Wno-ignored-pragma-optimize",
+      ]
       }
 
       if (!use_cobalt_customizations && !is_nacl) {
@@ -1734,12 +1733,12 @@ config("chromium_code") {
       # The platform should set warning flags.
       cflags = []
     } else {
-      if (is_clang) {
-        cflags = [ "/W4" ]  # Warning level 4.
+    if (is_clang) {
+      cflags = [ "/W4" ]  # Warning level 4.
 
-        # Opt in to additional [[nodiscard]] on standard library methods.
-        defines = [ "_HAS_NODISCARD" ]
-      }
+      # Opt in to additional [[nodiscard]] on standard library methods.
+      defines = [ "_HAS_NODISCARD" ]
+    }
     }
   } else if (is_starboard) {
     # TODO(b/205790602): Revisit this code to be more compatible with platforms.
@@ -1805,7 +1804,6 @@ config("chromium_code") {
       # Warn on missing break statements at the end of switch cases.
       # For intentional fallthrough, use [[fallthrough]].
       "-Wimplicit-fallthrough",
-
     ]
 
     if (!is_starboard) {
@@ -1851,7 +1849,9 @@ config("chromium_code") {
     }
   }
 
-  configs = [ ":default_warnings" ]
+  configs = [
+    ":default_warnings",
+  ]
 
   if (!is_starboard) {
     configs += [

build/config/dcheck_always_on.gni

@@ -2,9 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+if (!use_cobalt_customizations) {
 # TODO(crbug.com/1233050): Until the bug is resolved we need to include
 # gclient_args for the definition of build_with_chromium and build_overrides
 # for client overrides of that flag. The latter should go away.
+import("//build/config/gclient_args.gni")
+}
 import("//build_overrides/build.gni")
 declare_args() {
   # Enables DCHECKs to be built-in, but to default to being non-fatal/log-only.

build/config/ozone.gni

@@ -9,7 +9,8 @@ import("//build/toolchain/toolchain.gni")
 declare_args() {
   # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux
   # that does not require X11.
-  use_ozone = is_chromeos || is_fuchsia || is_linux && !is_starboard
+  use_ozone = is_chromeos || is_fuchsia || is_linux
+      && !is_starboard
 }
 
 declare_args() {

build/config/pch.gni

@@ -11,5 +11,6 @@ declare_args() {
   # doing official builds.
   # On Linux it slows down the build, so don't enable it by default.
   enable_precompiled_headers =
-      !is_official_build && !(use_goma || use_remoteexec) && !is_linux && !is_starboard
+      !is_official_build && !(use_goma || use_remoteexec) && !is_linux
+      && !is_starboard
 }

build/config/ui.gni

@@ -38,7 +38,8 @@ declare_args() {
   toolkit_views = is_mac || is_win || is_linux || is_chromeos || is_fuchsia
 
   use_glib =
-      is_linux && !is_castos && !is_starboard &&
+      is_linux && !is_castos &&
+      !is_starboard &&
       # Avoid the need for glib when Android is building things via secondary
       # toolchains.
       target_os != "android"

build/lacros/lacros_resource_sizes.pydeps

@@ -1,6 +1,5 @@
 # Generated by running:
 #   build/print_python_deps.py --root build/lacros --output build/lacros/lacros_resource_sizes.pydeps build/lacros/lacros_resource_sizes.py
-../../third_party/catapult/third_party/six/six.py
 ../../third_party/catapult/third_party/vinn/vinn/__init__.py
 ../../third_party/catapult/third_party/vinn/vinn/_vinn.py
 ../../third_party/catapult/tracing/tracing/__init__.py

build/lacros/test_runner.py

@@ -843,16 +843,6 @@ def Main():
       action='store_true',
       help='Whether to run subprocess log outputs through the asan symbolizer.')
 
-  # This is for version skew testing. The current CI/CQ builder builds
-  # an ash chrome and pass it using --ash-chrome-path. In order to use the same
-  # builder for version skew testing, we use a new argument to override
-  # the ash chrome.
-  test_parser.add_argument(
-      '--ash-chrome-path-override',
-      type=str,
-      help='The same as --ash-chrome-path. But this will override '
-      '--ash-chrome-path or --ash-chrome-version if any of these '
-      'arguments exist.')
   args = arg_parser.parse_known_args()
   if not hasattr(args[0], "func"):
     # No command specified.

build/toolchain/gcc_toolchain.gni

@@ -432,7 +432,7 @@ template("single_gcc_toolchain") {
       if (!is_starboard_toolchain && is_starboard && sb_is_modular) {
         command = "$asm $md -MF $depfile ${rebuild_string}{{defines}} {{include_dirs}} {{cflags}} {{asmflags}}${extra_asmflags} -c {{source}} -o {{output}}"
       } else {
-        command = "$asm $md -MF $depfile ${rebuild_string}{{defines}} {{include_dirs}} {{asmflags}}${extra_asmflags} -c {{source}} -o {{output}}"
+      command = "$asm $md -MF $depfile ${rebuild_string}{{defines}} {{include_dirs}} {{asmflags}}${extra_asmflags} -c {{source}} -o {{output}}"
       }
 
       depsformat = "gcc"

build/toolchain/ios/compile_xcassets.py

@@ -46,15 +46,6 @@ def FixAbsolutePathInLine(line, relative_paths):
   return relative_path + line[len(absolute_path):]
 
 
-def FixAbsolutePathInLine(line, relative_paths):
-  """Fix absolute paths present in |line| to relative paths."""
-  absolute_path = line.split(':')[0]
-  relative_path = relative_paths.get(absolute_path, absolute_path)
-  if absolute_path == relative_path:
-    return line
-  return relative_path + line[len(absolute_path):]
-
-
 def FilterCompilerOutput(compiler_output, relative_paths):
   """Filers actool compilation output.