diff --git a/DEPS b/DEPS index 428eef0a..984e9c71 100644 --- a/DEPS +++ b/DEPS
@@ -305,19 +305,19 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'src_internal_revision': 'fc69bb93413a049c3f467b975ffe3ee8882d0f4e', + 'src_internal_revision': '9044ebbb524768005838a1dc2a8b0e7114e575eb', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': '5d99c3fc7c8333de67376ce902a79b4ad53adcb1', + 'skia_revision': 'b54e1064ccae404b7a7bff410585fef1c5381241', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': 'f92236e339d6b28768f13fe7e17a3e466cfe0e6d', + 'v8_revision': '4cfbba3684e7d04a5d46c9f9a2117f84e02ef5ca', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '392d4a4dbfd8ba6f9935b2d1bb44f7e552e9ad26', + 'angle_revision': '1f40285c90cd45ae6238c57f30d0ec8c8d6e2e4b', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. @@ -329,7 +329,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. - 'boringssl_revision': 'f12212bb7348934f82fc84b110b4002c75ab2bdd', + 'boringssl_revision': '83297c2706c5497b2dba7fbb9524234d80945287', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Fuchsia sdk # and whatever else without interference from each other. @@ -373,11 +373,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '77ca383b7422ce137e49abd10e81997d48d80e64', + 'catapult_revision': 'e2b34e6c5df90b060797419372b230d5638a3843', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling CrossBench # and whatever else without interference from each other. - 'crossbench_revision': 'd8cebcefbb9280d4bc5a6ea138cee6b12399277b', + 'crossbench_revision': '1584e10215b310d7212edd3d59a58056966f175a', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling CrossBench # and whatever else without interference from each other. @@ -397,7 +397,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': '51be2d28128f3594b67ef99d24f4c58e68b6bab8', + 'devtools_frontend_revision': '2d6e3ee0f3197f192fe4d759e8eb6934dea46069', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -525,11 +525,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling llvm-libc # and whatever else without interference from each other. - 'llvm_libc_revision': 'a1d9ff08450caebe4c81de1ff07682f1d0a8806a', + 'llvm_libc_revision': '0388350fe90308d6c274af8f9ee2f1d6bcd28054', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling llvm-libc # and whatever else without interference from each other. - 'compiler_rt_revision': '5d7b9da0deb8d82caf76d90f02d775ee708bf42b', + 'compiler_rt_revision': '02145296c3a848274a6146176a74d0e468452e68', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling clusterfuzz-data # and whatever else without interference from each other. @@ -537,7 +537,7 @@ # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': 'e39a56726813663b378f05bd3096cbde2ec92ce7', + 'libcxx_revision': 'bcc74d7745a74dae059f1a4ca97e2979f5f77661', # GN CIPD package version. 'gn_version': 'git_revision:81b24e01531ecf0eff12ec9359a555ec3944ec4e', @@ -1190,7 +1190,7 @@ 'packages': [ { 'package': 'chromium/chrome/android/orderfiles/arm', - 'version': 'of7iQY59f3162jE0cfGN2FX1QqJSLGLrxPKX4Tg8YXMC', + 'version': 'T2mzadHQPsuVG1HhjRt3-c58amiQisG8Fp-qPRoY_FgC', }, ], 'condition': 'checkout_android', @@ -1201,7 +1201,7 @@ 'packages': [ { 'package': 'chromium/chrome/android/orderfiles/arm64', - 'version': 'nBWcheXGx0HWIRESg9E9tnKGVjTk99DayK4tbi05Wm8C', + 'version': '0afF61bx4wGehx0eczze3V2EfbcEDoo1G_6b1afMm5cC', }, ], 'condition': 'checkout_android', @@ -1212,7 +1212,7 @@ 'packages': [ { 'package': 'chromium/android_webview/tools/orderfiles/arm64', - 'version': 'g4DL--f2C87O-A1OmF0S8ep4QQuAG4QYi1PuQJItLfEC', + 'version': 'd7DpavunvU4AgJmf14dK0lOQJPu7lzAykqvsHXqXfvMC', }, ], 'condition': 'checkout_android', @@ -1395,7 +1395,7 @@ 'packages': [ { 'package': 'chromium/third_party/updater/chromium_mac_amd64', - 'version': 'version:2@1515027', + 'version': 'version:2@1516006', }, ], }, @@ -1406,7 +1406,7 @@ 'packages': [ { 'package': 'chromium/third_party/updater/chromium_mac_arm64', - 'version': 'version:2@1515013', + 'version': 'version:2@1516007', }, ], }, @@ -1417,7 +1417,7 @@ 'packages': [ { 'package': 'chromium/third_party/updater/chromium_win_arm64', - 'version': 'version:2@1515015', + 'version': 'version:2@1516036', }, ], }, @@ -1428,7 +1428,7 @@ 'packages': [ { 'package': 'chromium/third_party/updater/chromium_win_x86', - 'version': 'version:2@1515040', + 'version': 'version:2@1516032', }, ], }, @@ -1539,7 +1539,7 @@ 'packages': [ { 'package': 'chromium/third_party/enterprise_companion/chromium_mac_arm64', - 'version': 'Z2zDph1TVEzHUXKRp0K93yxckhCaPmjVYXIo7CHxmbcC', + 'version': 'WdKB-7nNrHFKi2mJZ6puAutbDZ0Uh3BoFKKiKBVKTPsC', }, ], }, @@ -1550,7 +1550,7 @@ 'packages': [ { 'package': 'chromium/third_party/enterprise_companion/chromium_win_x86', - 'version': 'dtoVdIZlthkHInKie-QX16mvfpq32TJBRYqPdNvCmUwC', + 'version': 'ZbyOSq8yWxPg5Y2YxH2vHVCK20Rb3LpGc3fLlbfP1bkC', }, ], }, @@ -1597,7 +1597,7 @@ 'packages': [ { 'package': 'chromium/chrome/test/data/variations/cipd', - 'version': 'vMMnV7kX6xWS9MoYHnQBTYNMlb0pTBkFlmfZcHpIgA8C', + 'version': 'mQ_9gPl7R7IhLcglHpk2eWsWllDGAyQ7lRQgsfrjtQIC', }, ], 'dep_type': 'cipd', @@ -1608,7 +1608,7 @@ 'src/clank': { 'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' + - '88a7eab10da63729eb92d27460d680cdf904c6d3', + '238c71a829afdc31a403a0d5d6cfb29c78fe49ca', 'condition': 'checkout_android and checkout_src_internal', }, @@ -2908,12 +2908,12 @@ 'dep_type': 'cipd', }, - 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@1acbb10d560942f3deccc74f55f91bf257d3ec91', - 'src/third_party/glslang/src': '{chromium_git}/external/github.com/KhronosGroup/glslang@d213562e35573012b6348b2d584457c3704ac09b', + 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@2458bba6f0d087f6ad588af68bcb4075c1d0701b', + 'src/third_party/glslang/src': '{chromium_git}/external/github.com/KhronosGroup/glslang@a57276bf558f5cf94d3a9854ebdf5a2236849a5a', 'src/third_party/spirv-cross/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@b8fcf307f1f347089e3c46eb4451d27f32ebc8d3', 'src/third_party/spirv-headers/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@01e0577914a75a2569c846778c2f93aa8e6feddd', 'src/third_party/spirv-tools/src': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@19042c8921f35f7bec56b9e5c96c5f5691588ca8', - 'src/third_party/vulkan-headers/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@9a0f3099c8a9607a7c0f3127d8abfdc19a93e8c5', + 'src/third_party/vulkan-headers/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@a4f8ada9f4f97c45b8c89c57997be9cebaae65d2', 'src/third_party/vulkan-loader/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@6ec5a0d91c253c6374701e142a95a0d3215bf5a7', 'src/third_party/vulkan-tools/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@e3ecc39da57a5ed15ec8de67f136273ee54b78be', 'src/third_party/vulkan-utility-libraries/src': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@23081f01cdee214226bfed5aedd37f092fa55dd9', @@ -3000,7 +3000,7 @@ }, 'src/third_party/zstd/src': - Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + 'e128976193546dceb24249206a02ff8f444f7120', + Var('chromium_git') + '/external/github.com/facebook/zstd.git' + '@' + '89d685e42dbcf815a16ed0fcd7d050ef74ccad96', 'src/tools/skia_goldctl/linux': { 'packages': [ @@ -3490,7 +3490,7 @@ 'src/chrome/browser/glic/e2e_test/internal': { 'url': Var('chrome_git') + '/chrome/browser/glic/test/internal.git' + '@' + - '93b10fd906d1b7d3a7ed6c1149e7fd942182300c', + '40c552cebdfc271664330b1eaf9c010bb3f73ec2', 'condition': 'checkout_glic_e2e_tests', },
diff --git a/agents/testing/eval_prompts.py b/agents/testing/eval_prompts.py index c1577dea..9b28ace0 100755 --- a/agents/testing/eval_prompts.py +++ b/agents/testing/eval_prompts.py
@@ -9,24 +9,18 @@ import logging import os import pathlib -import queue -import shutil import subprocess import sys import tempfile -import time import constants import promptfoo_installation -import results import workers TESTCASE_EXTENSION = '.promptfoo.yaml' _SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX' _TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS' -_ALL_TESTS_RUN_POLLING_SLEEP_DURATION = 0.5 - def _check_uncommitted_changes(cwd): out_dir = pathlib.Path(cwd) / 'out' @@ -250,53 +244,6 @@ return False -def _run_test_attempt( - config: pathlib.Path, - args: argparse.Namespace, - root_path: pathlib.Path, - is_btrfs: bool, - console_width: int, - promptfoo: 'promptfoo_installation.PromptfooInstallation', -) -> tuple[subprocess.CompletedProcess, float]: - """Runs a single attempt of a test. - - Args: - config: The path to the promptfoo config file. - args: The parsed command line args. - root_path: The path to the gclient root. - is_btrfs: Whether the checkout is on a btrfs filesystem. - console_width: The width of the console. - promptfoo: The promptfoo installation to use. - - Returns: - A tuple containing the completed process and the duration of the test. - """ - with workers.WorkDir('workdir', root_path, not args.no_clean, args.verbose, - args.force, is_btrfs) as workdir: - command = [ - 'eval', - '-j', - '1', - '--no-cache', - # Not useful since we're running one test per eval and the - # tables don't render properly in captured logs. - '--no-table', - '-c', - str(config), - '--var', - f'console_width={console_width}', - ] - if args.sandbox: - command.extend(['--var', 'sandbox=True']) - if args.verbose: - command.extend(['--var', 'verbose=True']) - - start_time = time.time() - proc = promptfoo.run(command, cwd=workdir.path / 'src') - duration = time.time() - start_time - return proc, duration - - def _run_prompt_eval_tests(args: argparse.Namespace) -> int: """Performs all the necessary steps to run prompt evaluation tests. @@ -322,61 +269,42 @@ if args.sandbox and not _fetch_sandbox_image(): return 1 - finished_test_queue = queue.Queue() - failed_test_queue = queue.Queue() - tests_run = results.AtomicCounter() - result_thread = results.ResultThread( - input_queue=finished_test_queue, - failed_result_queue=failed_test_queue, - tests_run=tests_run, - print_output_on_success=args.print_output_on_success) - result_thread.start() - - console_width = shutil.get_terminal_size().columns root_path = _get_gclient_root() - is_btrfs = _check_btrfs(root_path) - results_to_process = 0 - for config in configs_to_run: - for attempt in range(args.retries + 1): - if attempt > 0: - logging.info('Retrying test (%d/%d): %s', attempt, - args.retries, str(config)) - else: - logging.info('Running test: %s', str(config)) + worker_options = workers.WorkerOptions(root_path=root_path, + clean=not args.no_clean, + verbose=args.verbose, + force=args.force, + is_btrfs=_check_btrfs(root_path), + sandbox=args.sandbox) - proc, duration = _run_test_attempt(config, args, root_path, - is_btrfs, console_width, - promptfoo) - - r = results.TestResult(test_file=config, - success=not proc.returncode, - duration=duration, - test_log=proc.stdout) - finished_test_queue.put(r) - results_to_process += 1 - - if not proc.returncode: - break - - # Wait for all results to be reported. + worker_pool = workers.WorkerPool(args.parallel_workers, promptfoo, + worker_options, + args.print_output_on_success) + configs_for_current_iteration = configs_to_run failed_test_results = [] - while tests_run.get() != results_to_process: - result_thread.maybe_reraise_fatal_exception() - time.sleep(_ALL_TESTS_RUN_POLLING_SLEEP_DURATION) + for iteration in range(args.retries + 1): + if iteration != 0: + logging.info('Re-running %d failed tests', + len(configs_for_current_iteration)) + worker_pool.queue_tests(configs_for_current_iteration) + configs_for_current_iteration = [] + failed_test_results = worker_pool.wait_for_all_queued_tests() + if not failed_test_results: + break - # Drain the queue and shut down the result thread. - while not failed_test_queue.empty(): - failed_test_results.append(failed_test_queue.get()) - failed_test_results.sort() - result_thread.shutdown() - result_thread.join() + configs_for_current_iteration = [ + tr.test_file for tr in failed_test_results + ] + worker_pool.shutdown_blocking() returncode = 0 if failed_test_results: returncode = 1 - logging.warning('%d tests ran successfully and %d failed', - len(configs_to_run) - len(failed_test_results), - len(failed_test_results)) + logging.warning( + '%d tests ran successfully and %d failed after %d additional ' + 'tries', + len(configs_to_run) - len(failed_test_results), + len(failed_test_results), args.retries) logging.warning('Failed tests:') for ftr in failed_test_results: logging.warning(' %s', ftr.test_file) @@ -420,6 +348,13 @@ parser.add_argument('--filter', help='Only run configs that contain this substring.') parser.add_argument( + '--parallel-workers', + type=int, + default=1, + help=('The number of parallel workers to run tests in. Changing this ' + 'is not recommended if the Chromium checkout being used is not ' + 'on btrfs.')) + parser.add_argument( '--shard-index', type=int, help=(f'The index of the current shard. If set, --total-shards must '
diff --git a/agents/testing/eval_prompts_unittest.py b/agents/testing/eval_prompts_unittest.py index d9295f49..5ec6abb 100755 --- a/agents/testing/eval_prompts_unittest.py +++ b/agents/testing/eval_prompts_unittest.py
@@ -14,6 +14,7 @@ from pyfakefs import fake_filesystem_unittest import eval_prompts +import results # pylint: disable=protected-access @@ -483,6 +484,7 @@ self.args.sandbox = False self.args.print_output_on_success = False self.args.retries = 0 + self.args.parallel_workers = 1 def _setUpPatches(self): """Set up patches for the tests.""" @@ -490,33 +492,13 @@ self.mock_stdout = stdout_patcher.start() self.addCleanup(stdout_patcher.stop) - polling_patcher = mock.patch( - 'eval_prompts._ALL_TESTS_RUN_POLLING_SLEEP_DURATION', 0.001) - polling_patcher.start() - self.addCleanup(polling_patcher.stop) - - result_thread_patcher = mock.patch('eval_prompts.results.ResultThread') - self.mock_result_thread = result_thread_patcher.start() - self.addCleanup(result_thread_patcher.stop) - - atomic_counter_patcher = mock.patch( - 'eval_prompts.results.AtomicCounter') - self.mock_atomic_counter = atomic_counter_patcher.start() - self.addCleanup(atomic_counter_patcher.stop) - - workdir_patcher = mock.patch('workers.WorkDir') - self.mock_workdir = workdir_patcher.start() - mock_workdir_instance = ( - self.mock_workdir.return_value.__enter__.return_value) - mock_workdir_instance.path = pathlib.Path('/workdir') - self.addCleanup(workdir_patcher.stop) + worker_pool_patcher = mock.patch('eval_prompts.workers.WorkerPool') + self.mock_worker_pool = worker_pool_patcher.start() + self.addCleanup(worker_pool_patcher.stop) setup_promptfoo_patcher = mock.patch( 'promptfoo_installation.setup_promptfoo') self.mock_setup_promptfoo = setup_promptfoo_patcher.start() - mock_promptfoo_instance = self.mock_setup_promptfoo.return_value - mock_promptfoo_instance.run.return_value = subprocess.CompletedProcess( - args=[], returncode=0, stdout='Success') self.addCleanup(setup_promptfoo_patcher.stop) perform_chromium_setup_patcher = mock.patch( @@ -542,11 +524,6 @@ self.mock_check_btrfs.return_value = True self.addCleanup(check_btrfs_patcher.stop) - get_terminal_size_patcher = mock.patch('shutil.get_terminal_size') - self.mock_get_terminal_size = get_terminal_size_patcher.start() - self.mock_get_terminal_size.return_value = os.terminal_size((80, 24)) - self.addCleanup(get_terminal_size_patcher.stop) - subprocess_run_patcher = mock.patch('subprocess.run') self.mock_subprocess_run = subprocess_run_patcher.start() self.addCleanup(subprocess_run_patcher.stop) @@ -559,7 +536,8 @@ def test_run_prompt_eval_tests_one_test_pass(self): """Tests running a single passing test.""" - self.mock_atomic_counter.return_value.get.return_value = 1 + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + return_value = [] with self.assertLogs(level='INFO') as cm: returncode = eval_prompts._run_prompt_eval_tests(self.args) self.assertIn('Successfully ran 1 tests', cm.output[-1]) @@ -567,54 +545,41 @@ self.mock_perform_chromium_setup.assert_called_once_with(force=False, build=True) self.mock_setup_promptfoo.assert_called_once() - self.mock_workdir.assert_called_once_with('workdir', - pathlib.Path('/root'), True, - False, False, True) - self.mock_setup_promptfoo.return_value.run.assert_called_once() + self.mock_worker_pool.assert_called_once() + self.mock_worker_pool.return_value.queue_tests.assert_called_once_with( + [pathlib.Path('/test/a.yaml')]) + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + assert_called_once() + self.mock_worker_pool.return_value.shutdown_blocking.assert_called_once( + ) self.assertEqual(returncode, 0) - self.mock_result_thread.return_value.start.assert_called_once() - self.mock_result_thread.return_value.shutdown.assert_called_once() - self.mock_result_thread.return_value.join.assert_called_once() def test_run_prompt_eval_tests_one_test_fail(self): """Tests running a single failing test.""" self.mock_check_btrfs.return_value = False - self.mock_atomic_counter.return_value.get.return_value = 1 - mock_thread_instance = self.mock_result_thread.return_value - - mock_promptfoo_instance = self.mock_setup_promptfoo.return_value - mock_promptfoo_instance.run.return_value = subprocess.CompletedProcess( - args=[], returncode=1, stdout='Failure') + failed_test = results.TestResult(test_file='test', + success=False, + duration=1, + test_log='') + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + return_value = [ + failed_test + ] self.args.no_build = True self.args.no_clean = True self.args.verbose = True - with mock.patch('eval_prompts.queue.Queue') as mock_queue: - mock_failed_queue = mock_queue.return_value - mock_failed_queue.empty.side_effect = [False, True] - ftr = mock.Mock(spec=eval_prompts.results.TestResult) - ftr.test_file = 'test' - mock_failed_queue.get.return_value = ftr - with self.assertLogs(level='WARNING') as cm: - returncode = eval_prompts._run_prompt_eval_tests(self.args) - self.assertIn('0 tests ran successfully and 1 failed', - cm.output[-3]) - self.assertIn('Failed tests:', cm.output[-2]) - self.assertIn(' test', cm.output[-1]) + with self.assertLogs(level='WARNING') as cm: + returncode = eval_prompts._run_prompt_eval_tests(self.args) + self.assertIn( + '0 tests ran successfully and 1 failed after 0 additional ' + 'tries', cm.output[-3]) + self.assertIn('Failed tests:', cm.output[-2]) + self.assertIn(' test', cm.output[-1]) self.mock_perform_chromium_setup.assert_called_once_with(force=False, build=False) - self.mock_workdir.assert_called_once_with('workdir', - pathlib.Path('/root'), False, - True, False, False) - mock_promptfoo_instance.run.assert_called_once() - self.assertIn('--var', mock_promptfoo_instance.run.call_args[0][0]) - self.assertIn('verbose=True', - mock_promptfoo_instance.run.call_args[0][0]) self.assertEqual(returncode, 1) - mock_thread_instance.start.assert_called_once() - mock_thread_instance.shutdown.assert_called_once() - mock_thread_instance.join.assert_called_once() def test_run_prompt_eval_tests_multiple_tests_one_fail(self): """Tests running multiple tests where one fails.""" @@ -623,31 +588,25 @@ pathlib.Path('/test/b.yaml'), pathlib.Path('/test/c.yaml'), ] - self.mock_atomic_counter.return_value.get.return_value = 3 + failed_test = results.TestResult(test_file='test', + success=False, + duration=1, + test_log='') + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + return_value = [ + failed_test + ] - mock_promptfoo_instance = self.mock_setup_promptfoo.return_value - mock_promptfoo_instance.run.side_effect = [ - subprocess.CompletedProcess(args=[], returncode=0, stdout=''), - subprocess.CompletedProcess(args=[], returncode=1, stdout=''), - subprocess.CompletedProcess(args=[], returncode=0, stdout=''), - ] - - with mock.patch('eval_prompts.queue.Queue') as mock_queue: - mock_failed_queue = mock_queue.return_value - mock_failed_queue.empty.side_effect = [False, True] - ftr = mock.Mock(spec=eval_prompts.results.TestResult) - ftr.test_file = 'test' - mock_failed_queue.get.return_value = ftr - with self.assertLogs(level='WARNING') as cm: - returncode = eval_prompts._run_prompt_eval_tests(self.args) - self.assertIn('2 tests ran successfully and 1 failed', - cm.output[-3]) - self.assertIn('Failed tests:', cm.output[-2]) - self.assertIn(' test', cm.output[-1]) + with self.assertLogs(level='WARNING') as cm: + returncode = eval_prompts._run_prompt_eval_tests(self.args) + self.assertIn( + '2 tests ran successfully and 1 failed after 0 additional ' + 'tries', cm.output[-3]) + self.assertIn('Failed tests:', cm.output[-2]) + self.assertIn(' test', cm.output[-1]) self.mock_perform_chromium_setup.assert_called_once_with(force=False, build=True) - self.assertEqual(mock_promptfoo_instance.run.call_count, 3) self.assertEqual(returncode, 1) def test_run_prompt_eval_tests_sandbox_prefetch_fails(self): @@ -668,7 +627,8 @@ """Tests that _run_prompt_eval_tests calls pre-fetch and passes sandbox var when enabled.""" self.args.sandbox = True - self.mock_atomic_counter.return_value.get.return_value = 1 + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + return_value = [] eval_prompts._run_prompt_eval_tests(self.args) @@ -680,77 +640,75 @@ stderr=subprocess.STDOUT, cwd=mock.ANY, ) - mock_promptfoo_instance = self.mock_setup_promptfoo.return_value - mock_promptfoo_instance.run.assert_called_once() - command = mock_promptfoo_instance.run.call_args[0][0] - self.assertIn('--var', command) - self.assertIn('sandbox=True', command) + self.mock_worker_pool.assert_called_once() + self.assertTrue(self.mock_worker_pool.call_args[0][2].sandbox) def test_run_prompt_eval_tests_with_sandbox_disabled(self): """Tests that _run_prompt_eval_tests does not call pre-fetch or pass sandbox var when disabled.""" - self.mock_atomic_counter.return_value.get.return_value = 1 + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + return_value = [] eval_prompts._run_prompt_eval_tests(self.args) self.mock_subprocess_run.assert_not_called() - mock_promptfoo_instance = self.mock_setup_promptfoo.return_value - mock_promptfoo_instance.run.assert_called_once() - command = mock_promptfoo_instance.run.call_args[0][0] - for arg in command: - self.assertNotIn('sandbox', arg) + self.mock_worker_pool.assert_called_once() + self.assertFalse(self.mock_worker_pool.call_args[0][2].sandbox) def test_run_prompt_eval_tests_retry_pass(self): """Tests that a test that passes on retry is recorded as a success.""" self.args.retries = 1 - self.mock_atomic_counter.return_value.get.return_value = 2 - mock_promptfoo_instance = self.mock_setup_promptfoo.return_value - mock_promptfoo_instance.run.side_effect = [ - subprocess.CompletedProcess(args=[], returncode=1, stdout=''), - subprocess.CompletedProcess(args=[], returncode=0, stdout=''), - ] + failed_test = results.TestResult(test_file='test', + success=False, + duration=1, + test_log='') + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + side_effect = [ + [failed_test], + [], + ] with self.assertLogs(level='INFO') as cm: returncode = eval_prompts._run_prompt_eval_tests(self.args) self.assertIn('Successfully ran 1 tests', cm.output[-1]) - self.assertEqual(mock_promptfoo_instance.run.call_count, 2) + self.assertEqual( + self.mock_worker_pool.return_value.queue_tests.call_count, 2) self.assertEqual(returncode, 0) def test_run_prompt_eval_tests_retry_fail(self): """Tests that a test that fails all retries is recorded as a fail.""" self.args.retries = 2 - self.mock_atomic_counter.return_value.get.return_value = 3 - mock_promptfoo_instance = self.mock_setup_promptfoo.return_value - mock_promptfoo_instance.run.return_value = subprocess.CompletedProcess( - args=[], returncode=1, stdout='') + failed_test = results.TestResult(test_file='test', + success=False, + duration=1, + test_log='') + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + return_value = [ + failed_test + ] - with mock.patch('eval_prompts.queue.Queue') as mock_queue: - mock_failed_queue = mock_queue.return_value - mock_failed_queue.empty.side_effect = [False, True] - ftr = mock.Mock(spec=eval_prompts.results.TestResult) - ftr.test_file = 'test' - mock_failed_queue.get.return_value = ftr - with self.assertLogs(level='WARNING') as cm: - returncode = eval_prompts._run_prompt_eval_tests(self.args) - self.assertIn('0 tests ran successfully and 1 failed', - cm.output[-3]) + with self.assertLogs(level='WARNING') as cm: + returncode = eval_prompts._run_prompt_eval_tests(self.args) + self.assertIn( + '0 tests ran successfully and 1 failed after 2 additional ' + 'tries', cm.output[-3]) - self.assertEqual(mock_promptfoo_instance.run.call_count, 3) + self.assertEqual( + self.mock_worker_pool.return_value.queue_tests.call_count, 3) self.assertEqual(returncode, 1) def test_run_prompt_eval_tests_no_retry_on_pass(self): """Tests that a passing test is not retried.""" self.args.retries = 5 - self.mock_atomic_counter.return_value.get.return_value = 1 - mock_promptfoo_instance = self.mock_setup_promptfoo.return_value - mock_promptfoo_instance.run.return_value = subprocess.CompletedProcess( - args=[], returncode=0, stdout='') + self.mock_worker_pool.return_value.wait_for_all_queued_tests.\ + return_value = [] with self.assertLogs(level='INFO') as cm: returncode = eval_prompts._run_prompt_eval_tests(self.args) self.assertIn('Successfully ran 1 tests', cm.output[-1]) - self.assertEqual(mock_promptfoo_instance.run.call_count, 1) + self.assertEqual( + self.mock_worker_pool.return_value.queue_tests.call_count, 1) self.assertEqual(returncode, 0)
diff --git a/agents/testing/workers.py b/agents/testing/workers.py index b9842d0..8a63c34 100644 --- a/agents/testing/workers.py +++ b/agents/testing/workers.py
@@ -3,13 +3,24 @@ # found in the LICENSE file. """Module for isolated workers that run promptfoo tests.""" +import collections.abc +import copy import contextlib +import dataclasses import logging import pathlib +import queue import shutil import subprocess +import threading import time +import promptfoo_installation +import results + +_ALL_QUEUED_TESTS_RUN_POLLING_SLEEP_DURATION = 0.5 +_AVAILABLE_TEST_POLLING_SLEEP_DURATION = 0.1 + class WorkDir(contextlib.AbstractContextManager): """A WorkDir used for testing destructive changes by an agent. @@ -84,3 +95,211 @@ logging.debug('Removing with shutil') shutil.rmtree(self.path) logging.debug('Took %s seconds', time.time() - start_time) + + +@dataclasses.dataclass +class WorkerOptions: + """Options for configuring a single worker.""" + # The path to the gclient root to clone. + root_path: pathlib.Path + # Whether to clean the workdir after a test. + clean: bool + # Whether to log verbosely. + verbose: bool + # Whether to force cleaning. + force: bool + # Whether |root_path| is expected to be on a btrfs partition. + # TODO(crbug.com/445459870): Move btrfs code out of eval_prompts and just + # check this directly. + is_btrfs: bool + # Whether to run tests in a sandbox. + sandbox: bool + + +class WorkerPool: + """Abstracts away one or more WorkerThreads and a ResultThread.""" + + def __init__(self, num_workers: int, + promptfoo: promptfoo_installation.PromptfooInstallation, + worker_options: WorkerOptions, print_output_on_success: bool): + """ + Args: + num_workers: The number of workers to use to run tests. + promptfoo: A PromptfooInstallation to use when running tests. + worker_options: A WorkerOptions instance whose attributes will be + used when setting up workers. + print_output_on_success: If true, test logs will always be printed + to stdout instead of only for failed tests. + """ + assert num_workers > 0 + # Create a copy so that options cannot be externally modified. + worker_options = copy.deepcopy(worker_options) + + self._finished_test_queue = queue.Queue() + self._failed_test_queue = queue.Queue() + self._total_tests_run = results.AtomicCounter() + self._result_thread = results.ResultThread( + input_queue=self._finished_test_queue, + failed_result_queue=self._failed_test_queue, + tests_run=self._total_tests_run, + print_output_on_success=print_output_on_success) + self._result_thread.start() + + self._total_tests_queued = 0 + self._test_input_queue = queue.Queue() + self._workers = [] + for i in range(num_workers): + worker_thread = WorkerThread(i, promptfoo, worker_options, + self._test_input_queue, + self._finished_test_queue) + worker_thread.start() + self._workers.append(worker_thread) + + def __del__(self): + self.shutdown_blocking(2) + + def queue_tests(self, + tests: collections.abc.Collection[pathlib.Path]) -> None: + """Queues the provided tests to be run. + + Args: + tests: A Collection of paths to promptfoo test configs to run. + """ + self._total_tests_queued += len(tests) + for t in tests: + self._test_input_queue.put(t) + + def wait_for_all_queued_tests(self) -> list[results.TestResult]: + """Waits for all tests that have been queued to finish. + + Returns: + A list of failed TestResults that were produced since the last time + this method was called. + """ + while self._total_tests_run.get() != self._total_tests_queued: + self._result_thread.maybe_reraise_fatal_exception() + for w in self._workers: + w.maybe_reraise_fatal_exception() + time.sleep(_ALL_QUEUED_TESTS_RUN_POLLING_SLEEP_DURATION) + + failed_tests = [] + while not self._failed_test_queue.empty(): + failed_tests.append(self._failed_test_queue.get()) + return failed_tests + + def shutdown_blocking(self, timeout: float | None = None) -> None: + """Gracefully shuts down stored threads and waits for them to finish. + + Args: + timeout: An optional timeout to use when joining underlying + threads. + """ + threads_to_shutdown = self._workers + [self._result_thread] + for t in threads_to_shutdown: + t.shutdown() + for t in threads_to_shutdown: + t.join(timeout) + if t.is_alive(): + logging.error( + 'Failed to gracefully shut down thread %s in a WorkerPool', + t.native_id) + + +class WorkerThread(threading.Thread): + """Class for running tests from a queue in an isolated environment.""" + + def __init__(self, worker_index: int, + promptfoo: promptfoo_installation.PromptfooInstallation, + worker_options: WorkerOptions, + test_input_queue: queue.Queue[pathlib.Path], + test_result_queue: queue.Queue[results.TestResult], **kwargs): + """ + Args: + worker_index: The unique index of this thread. + promptfoo: The PromptfooInstallation to use when running tests. + worker_options: A WorkerOptions instance whose attributes will be + used when configuring this object. + test_input_queue: A Queue that will be read from to get tests to + run. + test_result_queue: A Queue that will receive TestResults for + completed tests. + """ + super().__init__(daemon=True, **kwargs) + self._worker_index = worker_index + self._promptfoo = promptfoo + self._worker_options = worker_options + self._console_width = shutil.get_terminal_size().columns + + self._test_input_queue = test_input_queue + self._test_result_queue = test_result_queue + self._shutdown_event = threading.Event() + self._fatal_exception = None + + def run(self) -> None: + try: + self._run_incoming_tests_until_shutdown() + except Exception as e: + self._fatal_exception = e + + def _run_incoming_tests_until_shutdown(self) -> None: + while not self._shutdown_event.is_set(): + try: + test_path = self._test_input_queue.get( + timeout=_AVAILABLE_TEST_POLLING_SLEEP_DURATION) + except queue.Empty: + continue + self._run_one_test(test_path) + + def _run_one_test(self, test_path: pathlib.Path) -> None: + """Runs a single Promptfoo test and queues a TestResult. + + Args: + test_path: The path to the Promptfoo test config file to run. + """ + with WorkDir( + f'workdir-{self._worker_index}', + self._worker_options.root_path, + self._worker_options.clean, + self._worker_options.verbose, + self._worker_options.force, + self._worker_options.is_btrfs, + ) as workdir: + command = [ + 'eval', + '-j', + '1', + '--no-cache', + # Not useful since we're running one test per eval and the + # tables don't render properly in captured logs. + '--no-table', + '-c', + str(test_path), + '--var', + f'console_width={self._console_width}', + ] + if self._worker_options.sandbox: + command.extend(['--var', 'sandbox=True']) + if self._worker_options.verbose: + command.extend(['--var', 'verbose=True']) + + start_time = time.time() + proc = self._promptfoo.run(command, cwd=workdir.path / 'src') + duration = time.time() - start_time + + r = results.TestResult(test_file=test_path, + success=not proc.returncode, + duration=duration, + test_log=proc.stdout) + self._test_result_queue.put(r) + + def shutdown(self) -> None: + """Tells the thread to shut down gracefully.""" + self._shutdown_event.set() + + def maybe_reraise_fatal_exception(self) -> None: + """Reraises the fatal exception that caused the thread to die. + + No-op if no exception is stored. + """ + if self._fatal_exception: + raise self._fatal_exception
diff --git a/agents/testing/workers_unittest.py b/agents/testing/workers_unittest.py index ff4d72c..0eab63e 100755 --- a/agents/testing/workers_unittest.py +++ b/agents/testing/workers_unittest.py
@@ -5,14 +5,22 @@ """Tests for workers.""" import pathlib +import queue import subprocess +import time import unittest from unittest import mock from pyfakefs import fake_filesystem_unittest +import promptfoo_installation +import results import workers +# pylint: disable=protected-access + +_POLLING_INTERVAL = 0.001 + class WorkDirUnittest(fake_filesystem_unittest.TestCase): """Unit tests for the WorkDir class.""" @@ -169,5 +177,331 @@ self.mock_rmtree.assert_not_called() +class WorkerThreadUnittest(unittest.TestCase): + """Unit tests for the WorkerThread class.""" + + def setUp(self): + self._setUpMocks() + self._setUpPatches() + + def _setUpMocks(self): + """Set up mocks for the tests.""" + self.mock_promptfoo = mock.Mock( + spec=promptfoo_installation.PromptfooInstallation) + self.mock_promptfoo.run.return_value = subprocess.CompletedProcess( + args=[], returncode=0, stdout='Success') + self.worker_options = workers.WorkerOptions( + root_path=pathlib.Path('/root'), + clean=True, + verbose=False, + force=False, + is_btrfs=True, + sandbox=False, + ) + self.test_input_queue = queue.Queue() + self.test_result_queue = queue.Queue() + + def _setUpPatches(self): + """Set up patches for the tests.""" + workdir_patcher = mock.patch('workers.WorkDir') + self.mock_workdir = workdir_patcher.start() + mock_workdir_instance = ( + self.mock_workdir.return_value.__enter__.return_value) + mock_workdir_instance.path = pathlib.Path('/workdir') + self.addCleanup(workdir_patcher.stop) + + polling_patcher = mock.patch( + 'workers._AVAILABLE_TEST_POLLING_SLEEP_DURATION', + _POLLING_INTERVAL) + polling_patcher.start() + self.addCleanup(polling_patcher.stop) + + def _create_and_run_worker(self, test_paths): + """Helper to create and run a worker thread.""" + for path in test_paths: + self.test_input_queue.put(path) + + worker = workers.WorkerThread( + worker_index=0, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + test_input_queue=self.test_input_queue, + test_result_queue=self.test_result_queue, + ) + worker.start() + + while self.test_result_queue.qsize() < len(test_paths): + worker.maybe_reraise_fatal_exception() + time.sleep(_POLLING_INTERVAL) + + worker.shutdown() + worker.join(1) + return worker + + def test_run_one_test_pass(self): + """Tests running a single passing test.""" + test_path = pathlib.Path('/test/a.yaml') + self._create_and_run_worker([test_path]) + + self.mock_workdir.assert_called_once_with('workdir-0', + pathlib.Path('/root'), True, + False, False, True) + self.mock_promptfoo.run.assert_called_once() + self.assertEqual(self.test_result_queue.qsize(), 1) + result = self.test_result_queue.get() + self.assertEqual(result.test_file, test_path) + self.assertTrue(result.success) + + def test_run_one_test_fail(self): + """Tests running a single failing test.""" + self.mock_promptfoo.run.return_value = subprocess.CompletedProcess( + args=[], returncode=1, stdout='Failure') + test_path = pathlib.Path('/test/a.yaml') + self._create_and_run_worker([test_path]) + + self.assertEqual(self.test_result_queue.qsize(), 1) + result = self.test_result_queue.get() + self.assertEqual(result.test_file, test_path) + self.assertFalse(result.success) + + def test_run_multiple_tests(self): + """Tests running multiple tests.""" + test_paths = [ + pathlib.Path('/test/a.yaml'), + pathlib.Path('/test/b.yaml') + ] + self._create_and_run_worker(test_paths) + + self.assertEqual(self.mock_workdir.call_count, 2) + self.assertEqual(self.mock_promptfoo.run.call_count, 2) + self.assertEqual(self.test_result_queue.qsize(), 2) + + def test_shutdown(self): + """Tests that the worker thread shuts down gracefully.""" + worker = self._create_and_run_worker([]) + self.assertFalse(worker.is_alive()) + + def test_fatal_exception(self): + """Tests that fatal exceptions are propagated.""" + worker = self._create_and_run_worker([]) + with mock.patch.object(worker, + '_run_incoming_tests_until_shutdown', + side_effect=ValueError('Test Error')): + worker.run() + + with self.assertRaisesRegex(ValueError, 'Test Error'): + worker.maybe_reraise_fatal_exception() + + def test_sandbox_and_verbose(self): + """Tests that sandbox and verbose flags are passed to promptfoo.""" + self.worker_options.sandbox = True + self.worker_options.verbose = True + self._create_and_run_worker([pathlib.Path('/test/a.yaml')]) + + self.mock_promptfoo.run.assert_called_once() + command = self.mock_promptfoo.run.call_args[0][0] + self.assertIn('--var', command) + self.assertIn('sandbox=True', command) + self.assertIn('verbose=True', command) + + +class WorkerPoolUnittest(unittest.TestCase): + """Unit tests for the WorkerPool class.""" + + def setUp(self): + self._setUpMocks() + self._setUpPatches() + + def _setUpMocks(self): + """Set up mocks for the tests.""" + self.mock_promptfoo = mock.Mock( + spec=promptfoo_installation.PromptfooInstallation) + self.worker_options = workers.WorkerOptions( + root_path=pathlib.Path('/root'), + clean=True, + verbose=False, + force=False, + is_btrfs=True, + sandbox=False, + ) + + def _setUpPatches(self): + """Set up patches for the tests.""" + + def create_thread_join_side_effect(mock_thread): + + def thread_join_side_effect(*args, **kwargs): + # pylint: disable=unused-argument + mock_thread.is_alive.return_value = False + + return thread_join_side_effect + + result_thread_patcher = mock.patch('workers.results.ResultThread') + self.mock_result_thread = result_thread_patcher.start() + mock_result_thread_instance = self.mock_result_thread.return_value + mock_result_thread_instance.is_alive.return_value = True + mock_result_thread_instance.join.side_effect = ( + create_thread_join_side_effect(mock_result_thread_instance)) + self.addCleanup(result_thread_patcher.stop) + + worker_thread_patcher = mock.patch('workers.WorkerThread') + self.mock_worker_thread = worker_thread_patcher.start() + mock_worker_thread_instance = self.mock_worker_thread.return_value + mock_worker_thread_instance.is_alive.return_value = True + mock_worker_thread_instance.join.side_effect = ( + create_thread_join_side_effect(mock_worker_thread_instance)) + self.addCleanup(worker_thread_patcher.stop) + + atomic_counter_patcher = mock.patch('workers.results.AtomicCounter') + self.mock_atomic_counter = atomic_counter_patcher.start() + self.addCleanup(atomic_counter_patcher.stop) + + polling_patcher = mock.patch( + 'workers._ALL_QUEUED_TESTS_RUN_POLLING_SLEEP_DURATION', + _POLLING_INTERVAL) + polling_patcher.start() + self.addCleanup(polling_patcher.stop) + + def test_create_pool(self): + """Tests that the pool is created with the correct number of workers.""" + pool = workers.WorkerPool( + num_workers=3, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + print_output_on_success=False, + ) + self.assertEqual(self.mock_worker_thread.call_count, 3) + self.mock_result_thread.assert_called_once() + pool.shutdown_blocking(1) + + def test_queue_tests(self): + """Tests that tests are queued correctly.""" + pool = workers.WorkerPool( + num_workers=1, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + print_output_on_success=False, + ) + test_paths = [ + pathlib.Path('/test/a.yaml'), + pathlib.Path('/test/b.yaml') + ] + pool.queue_tests(test_paths) + self.assertEqual(pool._test_input_queue.qsize(), 2) + pool.shutdown_blocking(1) + + def test_wait_for_all_queued_tests(self): + """Tests that the pool waits for all tests to complete.""" + self.mock_atomic_counter.return_value.get.side_effect = [0, 1, 2] + pool = workers.WorkerPool( + num_workers=1, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + print_output_on_success=False, + ) + test_paths = [ + pathlib.Path('/test/a.yaml'), + pathlib.Path('/test/b.yaml') + ] + pool.queue_tests(test_paths) + failed_tests = pool.wait_for_all_queued_tests() + self.assertEqual(len(failed_tests), 0) + self.assertEqual(self.mock_atomic_counter.return_value.get.call_count, + 3) + pool.shutdown_blocking(1) + + def test_wait_for_all_queued_tests_with_failures(self): + """Tests that failed tests are returned.""" + self.mock_atomic_counter.return_value.get.return_value = 1 + failed_test = results.TestResult(test_file='fail.yaml', + success=False, + duration=1, + test_log='') + with mock.patch('workers.queue.Queue') as mock_queue: + mock_failed_queue = mock_queue.return_value + mock_failed_queue.empty.side_effect = [False, True] + mock_failed_queue.get.return_value = failed_test + + pool = workers.WorkerPool( + num_workers=1, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + print_output_on_success=False, + ) + pool.queue_tests([pathlib.Path('fail.yaml')]) + failed_tests = pool.wait_for_all_queued_tests() + self.assertEqual(len(failed_tests), 1) + self.assertEqual(failed_tests[0], failed_test) + pool.shutdown_blocking(1) + + def test_shutdown_blocking(self): + """Tests that shutdown_blocking shuts down all threads.""" + pool = workers.WorkerPool( + num_workers=2, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + print_output_on_success=False, + ) + mock_workers = self.mock_worker_thread.return_value + mock_result = self.mock_result_thread.return_value + + pool.shutdown_blocking(1) + + self.assertEqual(mock_workers.shutdown.call_count, 2) + mock_result.shutdown.assert_called_once() + self.assertEqual(mock_workers.join.call_count, 2) + mock_result.join.assert_called_once() + + def test_wait_for_all_queued_tests_with_multiple_workers(self): + """Tests that the pool waits for all tests with multiple workers.""" + self.mock_atomic_counter.return_value.get.side_effect = [0, 0, 1, 1, 2] + pool = workers.WorkerPool( + num_workers=2, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + print_output_on_success=False, + ) + test_paths = [ + pathlib.Path('/test/a.yaml'), + pathlib.Path('/test/b.yaml') + ] + pool.queue_tests(test_paths) + failed_tests = pool.wait_for_all_queued_tests() + self.assertEqual(len(failed_tests), 0) + self.assertEqual(self.mock_atomic_counter.return_value.get.call_count, + 5) + pool.shutdown_blocking(1) + + def test_worker_thread_fatal_exception(self): + """Tests that a fatal exception in a worker thread is propagated.""" + self.mock_worker_thread.return_value.maybe_reraise_fatal_exception.\ + side_effect = ValueError('Worker Error') + pool = workers.WorkerPool( + num_workers=1, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + print_output_on_success=False, + ) + pool.queue_tests([pathlib.Path('/test/a.yaml')]) + with self.assertRaisesRegex(ValueError, 'Worker Error'): + pool.wait_for_all_queued_tests() + pool.shutdown_blocking(1) + + def test_result_thread_fatal_exception(self): + """Tests that a fatal exception in the result thread is propagated.""" + self.mock_result_thread.return_value.maybe_reraise_fatal_exception.\ + side_effect = ValueError('Result Error') + pool = workers.WorkerPool( + num_workers=1, + promptfoo=self.mock_promptfoo, + worker_options=self.worker_options, + print_output_on_success=False, + ) + pool.queue_tests([pathlib.Path('/test/a.yaml')]) + with self.assertRaisesRegex(ValueError, 'Result Error'): + pool.wait_for_all_queued_tests() + pool.shutdown_blocking(1) + + if __name__ == '__main__': unittest.main()
diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java index ec18e06f..d7ee961 100644 --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
@@ -192,7 +192,6 @@ + " is an active scroll or a touch interaction). This effectively removes" + " back-pressure in this case. This can result in wasted work and " + " contention, but should regularize the timing of client rendering."), - Flag.baseFeature(GpuFeatures.USE_GLES2_FOR_OOP_R, "Force Skia context to use es2 only."), Flag.baseFeature( NetFeatures.USE_NEW_ALPS_CODEPOINT_QUIC, "Enables using the new ALPS codepoint to negotiate application settings for QUIC."), @@ -1152,6 +1151,10 @@ BlinkFeatures.SEPARATE_DEFER_MODULE_SCRIPT_TASKS, "Enables yielding to the event loop between executing deferred module scripts to" + " improve responsiveness."), + Flag.baseFeature( + BaseFeatures.USE_IS_UNBOUND_CHECK, + "Use ChildServiceConnectionController.isUnbound() instead of isConnected() to check" + + " the connection state in ChildProcessConnection."), // Add new commandline switches and features above. The final entry should have a // trailing comma for cleaner diffs. };
diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h index 8da7154..c038cdb 100644 --- a/ash/constants/ash_features.h +++ b/ash/constants/ash_features.h
@@ -971,8 +971,6 @@ COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kVcWebApi); COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kFeatureManagementVideoConference); -COMPONENT_EXPORT(ASH_CONSTANTS) -BASE_DECLARE_FEATURE(kVirtualKeyboardBorderedKey); COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kWakeOnWifiAllowed); COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kWallpaperFastRefresh); COMPONENT_EXPORT(ASH_CONSTANTS)
diff --git a/ash/shelf/scroll_arrow_view.cc b/ash/shelf/scroll_arrow_view.cc index efcc1cc4..10e0a70 100644 --- a/ash/shelf/scroll_arrow_view.cc +++ b/ash/shelf/scroll_arrow_view.cc
@@ -12,6 +12,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/animation/ink_drop.h"
diff --git a/ash/system/palette/common_palette_tool.cc b/ash/system/palette/common_palette_tool.cc index 602f611..5c8a1f51 100644 --- a/ash/system/palette/common_palette_tool.cc +++ b/ash/system/palette/common_palette_tool.cc
@@ -15,6 +15,7 @@ #include "base/check.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/controls/label.h"
diff --git a/ash/wm/splitview/split_view_controller.cc b/ash/wm/splitview/split_view_controller.cc index 0f64526a..f5287dd5 100644 --- a/ash/wm/splitview/split_view_controller.cc +++ b/ash/wm/splitview/split_view_controller.cc
@@ -56,11 +56,13 @@ #include "ash/wm/window_util.h" #include "ash/wm/wm_metrics.h" #include "base/auto_reset.h" +#include "base/check_deref.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" #include "base/functional/bind.h" +#include "base/memory/raw_ref.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/notreached.h" @@ -573,8 +575,9 @@ window == WindowRestoreController::Get()->to_be_snapped_window(); // TODO: Investigate if we need to check for window activation. - if (!is_to_be_restored_window && !wm::CanActivateWindow(window)) + if (!is_to_be_restored_window && !wm::CanActivateWindow(window)) { return false; + } // We only need to consider the divider width in tablet mode or Snap Groups. const int divider_delta = @@ -1070,14 +1073,86 @@ } } +class SplitViewController::TabDragWindowObserver : public aura::WindowObserver { + public: + TabDragWindowObserver(SplitViewController* split_view_controller, + aura::Window* drag_window, + SnapPosition desired_snap_position, + const gfx::Point& last_location_in_screen, + WindowSnapActionSource snap_action_source) + : split_view_controller_(CHECK_DEREF(split_view_controller)), + drag_window_(drag_window), + desired_snap_position_(desired_snap_position), + last_location_in_screen_(last_location_in_screen), + snap_action_source_(snap_action_source) { + CHECK(drag_window_); + CHECK(window_util::IsDraggingTabs(drag_window_)); + drag_window_->AddObserver(this); + } + + ~TabDragWindowObserver() override { + if (drag_window_) { + drag_window_->RemoveObserver(this); + } + } + + // aura::WindowObserver: + void OnWindowDestroying(aura::Window* window) override { + // The dragged tabs got merged into another browser. + CHECK_EQ(window, drag_window_); + CHECK(window_util::IsDraggingTabs(drag_window_)); + CHECK(drag_window_->is_destroying()); + OnTabDragEnded(); + } + + // aura::WindowObserver: + void OnWindowPropertyChanged(aura::Window* window, + const void* key, + intptr_t old) override { + CHECK_EQ(window, drag_window_); + if (key == kIsDraggingTabsKey && + !window_util::IsDraggingTabs(drag_window_)) { + // The drag window survived the drag. + OnTabDragEnded(); + } + } + + private: + void OnTabDragEnded() { + drag_window_->RemoveObserver(this); + auto* window = drag_window_.get(); + drag_window_ = nullptr; + split_view_controller_->EndWindowDragImpl( + window, window->is_destroying(), desired_snap_position_, + last_location_in_screen_, snap_action_source_); + } + + const raw_ref<SplitViewController> split_view_controller_; + raw_ptr<aura::Window> drag_window_; + const SnapPosition desired_snap_position_; + const gfx::Point last_location_in_screen_; + const WindowSnapActionSource snap_action_source_; +}; + void SplitViewController::OnWindowDragEnded( aura::Window* dragged_window, SnapPosition desired_snap_position, const gfx::Point& last_location_in_screen, WindowSnapActionSource snap_action_source) { - EndWindowDragImpl(dragged_window, dragged_window->is_destroying(), - desired_snap_position, last_location_in_screen, - snap_action_source); + // In the case of tab dragging, ending the drag on top of another browser's + // tabstrip will destroy the dragged window and merge the tabs into the other + // browser. In that case we don't want to snap the drag window now (effect of + // EndWindowDragImpl). However, we can't tell which case we're in, so we have + // to delay calling EndWindowDragImpl. + if (window_util::IsDraggingTabs(dragged_window)) { + tab_drag_window_observer_ = std::make_unique<TabDragWindowObserver>( + this, dragged_window, desired_snap_position, last_location_in_screen, + snap_action_source); + } else { + EndWindowDragImpl(dragged_window, dragged_window->is_destroying(), + desired_snap_position, last_location_in_screen, + snap_action_source); + } } void SplitViewController::OnWindowDragCanceled() { @@ -1169,7 +1244,6 @@ void SplitViewController::OnWindowDestroyed(aura::Window* window) { DCHECK(InSplitViewMode()); DCHECK(IsWindowInSplitView(window)); - OnSnappedWindowDetached(window, WindowDetachedReason::kWindowDestroyed); }
diff --git a/ash/wm/splitview/split_view_controller.h b/ash/wm/splitview/split_view_controller.h index 77bbe850..9ab5630 100644 --- a/ash/wm/splitview/split_view_controller.h +++ b/ash/wm/splitview/split_view_controller.h
@@ -377,6 +377,7 @@ friend class SplitViewOverviewSessionTest; friend class SplitViewOverviewSession; class DividerSnapAnimation; + class TabDragWindowObserver; class ToBeSnappedWindowsObserver; // Reason that a snapped window is detached from the splitview. @@ -668,6 +669,10 @@ // A flag indicates the window bounds is currently changed due to the virtual // keyboard. bool changing_bounds_by_vk_ = false; + + // Used to delay snapping a drag window until we know the drag window + // survives the drag. + std::unique_ptr<TabDragWindowObserver> tab_drag_window_observer_; }; } // namespace ash
diff --git a/ash/wm/splitview/split_view_controller_unittest.cc b/ash/wm/splitview/split_view_controller_unittest.cc index 8f74855..6fff1fa2 100644 --- a/ash/wm/splitview/split_view_controller_unittest.cc +++ b/ash/wm/splitview/split_view_controller_unittest.cc
@@ -4741,8 +4741,9 @@ EXPECT_TRUE(WindowState::Get(other_window.get())->IsSnapped()); auto [resizer, _] = StartTabDrag(source_window.get()); - // Not yet supported. - EXPECT_FALSE(resizer.get()); + EXPECT_TRUE(resizer.get()); + DragWithOffset(resizer.get(), 100, 100); + CompleteTabDrag(std::move(resizer)); } TEST_F(SplitViewDraggingTest, NoBackDropDuringTabDragging) {
diff --git a/ash/wm/tablet_mode/tablet_mode_window_resizer.cc b/ash/wm/tablet_mode/tablet_mode_window_resizer.cc index d50119d8..b3d1cbd4 100644 --- a/ash/wm/tablet_mode/tablet_mode_window_resizer.cc +++ b/ash/wm/tablet_mode/tablet_mode_window_resizer.cc
@@ -107,6 +107,10 @@ initial_location_in_screen_ = location_in_screen; WindowBackdrop::Get(dragged_window_)->DisableBackdrop(); + // We don't really need to call SplitViewController::OnWindowDragStarted as + // long as we don't allow dragging entire windows (and even then I'm not + // sure). Do it anyways in order to match the later OnWindowDragEnded call. + split_view_controller_->OnWindowDragStarted(dragged_window_); split_view_drag_indicators_->SetDraggedWindow(dragged_window_); } @@ -142,6 +146,7 @@ ? GetSnapPosition(location_in_screen) : SnapPosition::kNone; + // Notify SplitViewController so it can do its work (e.g. snap the window). split_view_controller_->OnWindowDragEnded( dragged_window_, snap_position, gfx::ToRoundedPoint(location_in_screen), WindowSnapActionSource::kDragDownFromTopToSnap); @@ -158,6 +163,14 @@ return SnapPosition::kNone; } + // If we're already in split view, determine the snap position simply based on + // which side of the split view `location_in_screen` is. As a consequence, the + // snap indicator will show even if not dragging to the screen edge. + if (split_view_controller_->InSplitViewMode()) { + return split_view_controller_->ComputeSnapPosition( + gfx::ToRoundedPoint(location_in_screen)); + } + const gfx::Rect area = screen_util::GetDisplayWorkAreaBoundsInScreenForActiveDeskContainer( dragged_window_);
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index 9a0ed2f..c5e0bd7f 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -333,11 +333,6 @@ SplitViewController::Get(Shell::GetPrimaryRootWindow()) ->InTabletSplitViewMode()); - if (SplitViewController::Get(Shell::GetPrimaryRootWindow()) - ->InSplitViewMode()) { - return nullptr; - } - window_state->CreateDragDetails(point_in_parent, window_component, source); auto resizer = std::make_unique<TabletModeWindowResizer>( window_state, std::make_unique<TabletModeWindowDragDelegate>());
diff --git a/base/android/base_feature_map.cc b/base/android/base_feature_map.cc index 547a2741e..1f6a201a 100644 --- a/base/android/base_feature_map.cc +++ b/base/android/base_feature_map.cc
@@ -22,6 +22,7 @@ &features::kPostGetMyMemoryStateToBackground, &features::kRebindingChildServiceConnectionController, &features::kUpdateStateBeforeUnbinding, + &features::kUseIsUnboundCheck, &features::kUseSharedRebindServiceConnection, };
diff --git a/base/android/java/src/org/chromium/base/BaseFeatureList.java b/base/android/java/src/org/chromium/base/BaseFeatureList.java index c421c2c..811fdf19 100644 --- a/base/android/java/src/org/chromium/base/BaseFeatureList.java +++ b/base/android/java/src/org/chromium/base/BaseFeatureList.java
@@ -33,6 +33,10 @@ BaseFeatures.UPDATE_STATE_BEFORE_UNBINDING, false); + public static final MutableFlagWithSafeDefault sUseIsUnboundCheck = + new MutableFlagWithSafeDefault( + BaseFeatureMap.getInstance(), BaseFeatures.USE_IS_UNBOUND_CHECK, false); + public static final MutableFlagWithSafeDefault sUseSharedRebindServiceConnection = new MutableFlagWithSafeDefault( BaseFeatureMap.getInstance(),
diff --git a/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java index 98237e8..be0a601 100644 --- a/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java +++ b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java
@@ -320,6 +320,12 @@ // have it flip half way in the middle. private final boolean mIsEffectiveBindingStateEnabled; + // Whether the UseIsUnboundCheck feature is enabled. + // + // The feature status has to stay consistent throughout the lifetime of this object, and can't + // have it flip half way in the middle. + private final boolean mUseIsUnboundCheck; + public ChildProcessConnection( Context context, ComponentName serviceName, @@ -370,6 +376,7 @@ mIndependentFallback = independentFallback; mIsSandboxedForHistograms = isSandboxedForHistograms; mIsEffectiveBindingStateEnabled = BaseFeatureList.sEffectiveBindingState.isEnabled(); + mUseIsUnboundCheck = BaseFeatureList.sUseIsUnboundCheck.isEnabled(); // Incremental install does not work with isolatedProcess, and externalService requires // isolatedProcess, so both need to be turned off for incremental install. @@ -980,7 +987,7 @@ public void addStrongBinding() { assert isRunningOnLauncherThread(); - if (!isConnected()) { + if (isUnboundForStateChange()) { Log.w(TAG, "The connection is not bound for %d", getPid()); return; } @@ -994,7 +1001,7 @@ public void removeStrongBinding() { assert isRunningOnLauncherThread(); - if (!isConnected()) { + if (isUnboundForStateChange()) { return; } assert mStrongBindingCount > 0; @@ -1018,7 +1025,7 @@ public void addVisibleBinding() { assert isRunningOnLauncherThread(); - if (!isConnected()) { + if (isUnboundForStateChange()) { Log.w(TAG, "The connection is not bound for %d", getPid()); return; } @@ -1032,7 +1039,7 @@ public void removeVisibleBinding() { assert isRunningOnLauncherThread(); - if (!isConnected()) { + if (isUnboundForStateChange()) { return; } assert mVisibleBindingCount > 0; @@ -1051,7 +1058,7 @@ public void addNotPerceptibleBinding() { assert isRunningOnLauncherThread(); - if (!isConnected()) { + if (isUnboundForStateChange()) { Log.w(TAG, "The connection is not bound for %d", getPid()); return; } @@ -1065,7 +1072,7 @@ public void removeNotPerceptibleBinding() { assert isRunningOnLauncherThread(); - if (!isConnected()) { + if (isUnboundForStateChange()) { return; } assert mNotPerceptibleBindingCount > 0; @@ -1079,7 +1086,7 @@ private void applyEffectiveBindingState() { assert isRunningOnLauncherThread(); - assert isConnected(); + assert !isUnboundForStateChange(); @ChildBindingState int effectiveBindingState = ChildBindingState.WAIVED; if (mStrongBindingCount > 0) { effectiveBindingState = ChildBindingState.STRONG; @@ -1202,4 +1209,17 @@ // Ignore } } + + /** + * Returns whether we can update binding state. + * + * <p>Historically, we used `isConnected()`. But mConnectionController.isUnbound() is more + * accurate. + * + * <p>TODO(crbug.com/447057423): Remove the flag and always use + * mConnectionController.isUnbound() after verifying it's safe. + */ + private boolean isUnboundForStateChange() { + return mUseIsUnboundCheck ? mConnectionController.isUnbound() : !isConnected(); + } }
diff --git a/base/features.cc b/base/features.cc index fde3442e..ef97ca4 100644 --- a/base/features.cc +++ b/base/features.cc
@@ -154,6 +154,10 @@ // Update child process binding state before unbinding. BASE_FEATURE(kUpdateStateBeforeUnbinding, FEATURE_DISABLED_BY_DEFAULT); +// Use ChildServiceConnectionController.isUnbound() instead of isConnected() to +// check the connection state in ChildProcessConnection. +BASE_FEATURE(kUseIsUnboundCheck, FEATURE_DISABLED_BY_DEFAULT); + // Use shared service connection to rebind a service binding to update the LRU // in the ProcessList of OomAdjuster. BASE_FEATURE(kUseSharedRebindServiceConnection, FEATURE_ENABLED_BY_DEFAULT);
diff --git a/base/features.h b/base/features.h index 7f3339c..4999905 100644 --- a/base/features.h +++ b/base/features.h
@@ -52,6 +52,7 @@ BASE_EXPORT BASE_DECLARE_FEATURE(kPostGetMyMemoryStateToBackground); BASE_EXPORT BASE_DECLARE_FEATURE(kRebindingChildServiceConnectionController); BASE_EXPORT BASE_DECLARE_FEATURE(kUpdateStateBeforeUnbinding); +BASE_EXPORT BASE_DECLARE_FEATURE(kUseIsUnboundCheck); BASE_EXPORT BASE_DECLARE_FEATURE(kUseSharedRebindServiceConnection); BASE_EXPORT BASE_DECLARE_FEATURE(kBackgroundThreadPoolFieldTrial);
diff --git a/base/json/json_reader.h b/base/json/json_reader.h index a553d15..1b00a30 100644 --- a/base/json/json_reader.h +++ b/base/json/json_reader.h
@@ -112,7 +112,7 @@ // If |json| is not a properly formed JSON dict string, returns std::nullopt. static std::optional<Value::Dict> ReadDict( std::string_view json, - int options, + int options = JSON_PARSE_CHROMIUM_EXTENSIONS, size_t max_depth = internal::kAbsoluteMaxDepth); // Reads and parses |json|, returning a Value::List.
diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc index e48d4c5..9483c97 100644 --- a/base/json/json_reader_unittest.cc +++ b/base/json/json_reader_unittest.cc
@@ -1221,14 +1221,12 @@ } { - std::optional<base::Value::Dict> dict = - JSONReader::ReadDict("{}", JSON_PARSE_CHROMIUM_EXTENSIONS); + std::optional<base::Value::Dict> dict = JSONReader::ReadDict("{}"); ASSERT_TRUE(dict); } { - std::optional<base::Value::Dict> dict = - JSONReader::ReadDict("[1, 2, 3]", JSON_PARSE_CHROMIUM_EXTENSIONS); + std::optional<base::Value::Dict> dict = JSONReader::ReadDict("[1, 2, 3]"); ASSERT_FALSE(dict); } }
diff --git a/base/test/android/content_uri_test_utils.cc b/base/test/android/content_uri_test_utils.cc index 003b5ac..d14d7951 100644 --- a/base/test/android/content_uri_test_utils.cc +++ b/base/test/android/content_uri_test_utils.cc
@@ -10,6 +10,7 @@ #include "base/android/path_utils.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/strings/escape.h" #include "base/strings/strcat.h" @@ -84,4 +85,14 @@ return base::ResolveToVirtualDocumentPath(*content_url); } +std::optional<FilePath> CreateCacheCopyAndGetContentUri( + const FilePath& source_path, + const ScopedTempDir& temp_dir) { + if (!base::CopyDirectory(source_path, temp_dir.GetPath(), true)) { + return std::nullopt; + } + return GetInMemoryContentTreeUriFromCacheDirDirectory( + temp_dir.GetPath().Append(source_path.BaseName())); +} + } // namespace base::test::android
diff --git a/base/test/android/content_uri_test_utils.h b/base/test/android/content_uri_test_utils.h index b971d4a..dfdf87c6 100644 --- a/base/test/android/content_uri_test_utils.h +++ b/base/test/android/content_uri_test_utils.h
@@ -9,6 +9,7 @@ namespace base { class FilePath; +class ScopedTempDir; namespace test::android { @@ -40,6 +41,17 @@ std::optional<FilePath> GetVirtualDocumentPathFromCacheDirDirectory( const FilePath& path); +// Copies a source directory into an existing ScopedTempDir and generates a +// content URI for it. +// +// This is a workaround for Android security policies that prevent loading +// extensions directly from the file system. This function enables tests by +// copying the extension directory to a temporary location and resolving it to +// a content URI, which can then be used for extension packing. +std::optional<FilePath> CreateCacheCopyAndGetContentUri( + const FilePath& source_path, + const ScopedTempDir& temp_dir); + } // namespace test::android } // namespace base
diff --git a/build/config/c++/modules.gni b/build/config/c++/modules.gni index 9d0d3e0..4b3a635 100644 --- a/build/config/c++/modules.gni +++ b/build/config/c++/modules.gni
@@ -46,19 +46,12 @@ } if (!use_autogenerated_modules && use_clang_modules) { - sysroot_modulemaps = [ "$sdk_path/usr/include/DarwinBasic.modulemap" ] - if (xcode_version_int >= 2600) { - sysroot_modulemaps += [ - "$sdk_path/usr/include/DarwinFoundation1.modulemap", - "$sdk_path/usr/include/DarwinFoundation2.modulemap", - "$sdk_path/usr/include/DarwinFoundation3.modulemap", - ] - } else { - sysroot_modulemaps += [ - "$sdk_path/usr/include/c_standard_library.modulemap", - "$sdk_path/usr/include/DarwinFoundation.modulemap", - ] - } + sysroot_modulemaps = [ + "$sdk_path/usr/include/DarwinBasic.modulemap", + "$sdk_path/usr/include/DarwinFoundation1.modulemap", + "$sdk_path/usr/include/DarwinFoundation2.modulemap", + "$sdk_path/usr/include/DarwinFoundation3.modulemap", + ] # Textual modules do not need to be precompiled. # However, like regular modules, they do need to include things.
diff --git a/build/config/siso/nasm_linux.star b/build/config/siso/nasm_linux.star index 7b4b8fda..a1c460a 100644 --- a/build/config/siso/nasm_linux.star +++ b/build/config/siso/nasm_linux.star
@@ -13,9 +13,7 @@ __handlers = {} def __step_config(ctx, step_config): - # TODO: crbug.com/447224649, crbug.com/447175273 - Disable remote temporarily to - # avoid the RBE's Ubuntu issue. - remote_run = False + remote_run = True # Turn this to False when you do file access trace. rules = [] for toolchain in ["", "clang_x64"]: nasm_path = path.join(toolchain, "nasm")
diff --git a/build/config/siso/v8.star b/build/config/siso/v8.star index 5de22f7e..e534ce4 100644 --- a/build/config/siso/v8.star +++ b/build/config/siso/v8.star
@@ -9,9 +9,7 @@ load("./platform.star", "platform") def __step_config(ctx, step_config): - # TODO: crbug.com/447224649, crbug.com/447175273 - Disable remote temporarily to - # avoid the RBE's Ubuntu issue. - remote_run = False + remote_run = True # Turn this to False when you do file access trace. if "args.gn" in ctx.metadata: gn_args = gn.args(ctx) if gn_args.get("target_cpu", "").strip('"') == "x86":
diff --git a/build/modules/android-arm/module.modulemap.in b/build/modules/android-arm/module.modulemap.in index 3d0952b..8f3844e 100644 --- a/build/modules/android-arm/module.modulemap.in +++ b/build/modules/android-arm/module.modulemap.in
@@ -240,6 +240,14 @@ header "$sysroot/sys/ioctl.h" export * } + module sys_syscall_h { + header "$sysroot/sys/syscall.h" + export * + } + module syscall_h { + header "$sysroot/syscall.h" + export * + } module xlocale_h { header "$sysroot/xlocale.h" export *
diff --git a/build/modules/android-arm64/module.modulemap.in b/build/modules/android-arm64/module.modulemap.in index e3d25c04..c8da0947 100644 --- a/build/modules/android-arm64/module.modulemap.in +++ b/build/modules/android-arm64/module.modulemap.in
@@ -252,6 +252,14 @@ header "$sysroot/sys/ioctl.h" export * } + module sys_syscall_h { + header "$sysroot/sys/syscall.h" + export * + } + module syscall_h { + header "$sysroot/syscall.h" + export * + } module xlocale_h { header "$sysroot/xlocale.h" export *
diff --git a/build/modules/android-x64/module.modulemap.in b/build/modules/android-x64/module.modulemap.in index 98e2ff9..940afde 100644 --- a/build/modules/android-x64/module.modulemap.in +++ b/build/modules/android-x64/module.modulemap.in
@@ -248,6 +248,14 @@ header "$sysroot/sys/ioctl.h" export * } + module sys_syscall_h { + header "$sysroot/sys/syscall.h" + export * + } + module syscall_h { + header "$sysroot/syscall.h" + export * + } module xlocale_h { header "$sysroot/xlocale.h" export *
diff --git a/build/modules/android-x86/module.modulemap.in b/build/modules/android-x86/module.modulemap.in index c12ebaab..1a526aa 100644 --- a/build/modules/android-x86/module.modulemap.in +++ b/build/modules/android-x86/module.modulemap.in
@@ -248,6 +248,14 @@ header "$sysroot/sys/ioctl.h" export * } + module sys_syscall_h { + header "$sysroot/sys/syscall.h" + export * + } + module syscall_h { + header "$sysroot/syscall.h" + export * + } module xlocale_h { header "$sysroot/xlocale.h" export *
diff --git a/build/modules/linux-arm/module.modulemap.in b/build/modules/linux-arm/module.modulemap.in index 9e41efe..1986215 100644 --- a/build/modules/linux-arm/module.modulemap.in +++ b/build/modules/linux-arm/module.modulemap.in
@@ -43,6 +43,14 @@ header "$sysroot/arm-linux-gnueabihf/asm/sigcontext.h" export * } + module asm_unistd_eabi_h { + header "$sysroot/arm-linux-gnueabihf/asm/unistd-eabi.h" + export * + } + module asm_unistd_h { + header "$sysroot/arm-linux-gnueabihf/asm/unistd.h" + export * + } module endian_h { header "$sysroot/endian.h" export * @@ -124,6 +132,10 @@ header "$sysroot/arm-linux-gnueabihf/sys/select.h" export * } + module sys_syscall_h { + header "$sysroot/arm-linux-gnueabihf/sys/syscall.h" + export * + } module sys_ttydefaults_h { header "$sysroot/arm-linux-gnueabihf/sys/ttydefaults.h" export * @@ -136,6 +148,10 @@ header "$sysroot/arm-linux-gnueabihf/sys/ucontext.h" export * } + module syscall_h { + header "$sysroot/syscall.h" + export * + } module threads_h { header "$sysroot/threads.h" export *
diff --git a/build/modules/linux-arm64/module.modulemap.in b/build/modules/linux-arm64/module.modulemap.in index ff76734a..ec63a82 100644 --- a/build/modules/linux-arm64/module.modulemap.in +++ b/build/modules/linux-arm64/module.modulemap.in
@@ -43,6 +43,10 @@ header "$sysroot/asm-generic/types.h" export * } + module asm_generic_unistd_h { + header "$sysroot/asm-generic/unistd.h" + export * + } module asm_bitsperlong_h { header "$sysroot/aarch64-linux-gnu/asm/bitsperlong.h" export * @@ -75,6 +79,10 @@ header "$sysroot/aarch64-linux-gnu/asm/types.h" export * } + module asm_unistd_h { + header "$sysroot/aarch64-linux-gnu/asm/unistd.h" + export * + } module endian_h { header "$sysroot/endian.h" export * @@ -172,6 +180,10 @@ header "$sysroot/aarch64-linux-gnu/sys/select.h" export * } + module sys_syscall_h { + header "$sysroot/aarch64-linux-gnu/sys/syscall.h" + export * + } module sys_time_h { header "$sysroot/aarch64-linux-gnu/sys/time.h" export * @@ -192,6 +204,10 @@ header "$sysroot/aarch64-linux-gnu/sys/user.h" export * } + module syscall_h { + header "$sysroot/syscall.h" + export * + } module threads_h { header "$sysroot/threads.h" export *
diff --git a/build/modules/linux-x64/module.modulemap.in b/build/modules/linux-x64/module.modulemap.in index b87fc68..5698df8 100644 --- a/build/modules/linux-x64/module.modulemap.in +++ b/build/modules/linux-x64/module.modulemap.in
@@ -39,6 +39,14 @@ header "$sysroot/x86_64-linux-gnu/asm/ioctls.h" export * } + module asm_unistd_h { + header "$sysroot/x86_64-linux-gnu/asm/unistd.h" + export * + } + module asm_unistd_64_h { + header "$sysroot/x86_64-linux-gnu/asm/unistd_64.h" + export * + } module endian_h { header "$sysroot/endian.h" export * @@ -120,6 +128,10 @@ header "$sysroot/x86_64-linux-gnu/sys/select.h" export * } + module sys_syscall_h { + header "$sysroot/x86_64-linux-gnu/sys/syscall.h" + export * + } module sys_ttydefaults_h { header "$sysroot/x86_64-linux-gnu/sys/ttydefaults.h" export * @@ -132,6 +144,10 @@ header "$sysroot/x86_64-linux-gnu/sys/ucontext.h" export * } + module syscall_h { + header "$sysroot/syscall.h" + export * + } module threads_h { header "$sysroot/threads.h" export *
diff --git a/build/modules/linux-x86/module.modulemap.in b/build/modules/linux-x86/module.modulemap.in index 786397c..ac94a08 100644 --- a/build/modules/linux-x86/module.modulemap.in +++ b/build/modules/linux-x86/module.modulemap.in
@@ -39,6 +39,14 @@ header "$sysroot/i386-linux-gnu/asm/ioctls.h" export * } + module asm_unistd_h { + header "$sysroot/i386-linux-gnu/asm/unistd.h" + export * + } + module asm_unistd_32_h { + header "$sysroot/i386-linux-gnu/asm/unistd_32.h" + export * + } module endian_h { header "$sysroot/endian.h" export * @@ -120,6 +128,10 @@ header "$sysroot/i386-linux-gnu/sys/select.h" export * } + module sys_syscall_h { + header "$sysroot/i386-linux-gnu/sys/syscall.h" + export * + } module sys_ttydefaults_h { header "$sysroot/i386-linux-gnu/sys/ttydefaults.h" export * @@ -132,6 +144,10 @@ header "$sysroot/i386-linux-gnu/sys/ucontext.h" export * } + module syscall_h { + header "$sysroot/syscall.h" + export * + } module threads_h { header "$sysroot/threads.h" export *
diff --git a/build/modules/modularize/config.py b/build/modules/modularize/config.py index 3e30b17..ae6490f 100644 --- a/build/modules/modularize/config.py +++ b/build/modules/modularize/config.py
@@ -45,6 +45,7 @@ 'fcntl.h', 'getopt.h', 'sys/ioctl.h', + 'syscall.h', ] @@ -137,9 +138,19 @@ graph['asm-generic/posix_types.h'].textual = True graph['asm/posix_types.h'].textual = True + # sys/syscall.h includes asm/unistd.h, which includes + # asm/unistd_<platform>.h, which defines some macros. + # It then includes bits/glibc-syscalls.h which uses said macros, so both + # must be non-textual. + for k in graph: + if k.startswith('asm/unistd'): + graph[k].textual = True + graph['bits/glibc-syscalls.h'].textual = True + elif compiler.os == Os.Linux: # See https://codebrowser.dev/glibc/glibc/sysdeps/unix/sysv/linux/bits/local_lim.h.html#56 - # if linux/limits.h is non-textual, then limits.h undefs the limits.h defined in the linux/limits.h module. + # if linux/limits.h is non-textual, then limits.h undefs the limits.h + # defined in the linux/limits.h module. # Thus, limits.h exports an undef. # if it's textual, limits.h undefs something it defined itself. graph['linux/limits.h'].textual = True
diff --git a/build/modules/win-x64/module.modulemap.in b/build/modules/win-x64/module.modulemap.in index 40c81284..6920a02 100644 --- a/build/modules/win-x64/module.modulemap.in +++ b/build/modules/win-x64/module.modulemap.in
@@ -7,6 +7,10 @@ module sys_stage1 [system] [extern_c] { + module __msvc_cxx_stdatomic_hpp { + header "$msvc/__msvc_cxx_stdatomic.hpp" + export * + } module concurrencysal_h { header "$msvc/concurrencysal.h" export * @@ -75,6 +79,10 @@ header "$windows_kits/ucrt/corecrt_wtime.h" export * } + module crtdbg_h { + header "$windows_kits/ucrt/crtdbg.h" + export * + } module crtdefs_h { header "$msvc/crtdefs.h" export * @@ -135,6 +143,10 @@ header "$windows_kits/ucrt/time.h" export * } + module use_ansi_h { + header "$msvc/use_ansi.h" + export * + } module vadefs_h { header "$msvc/vadefs.h" export * @@ -171,6 +183,18 @@ header "$windows_kits/shared/winpackagefamily.h" export * } + module xkeycheck_h { + header "$msvc/xkeycheck.h" + export * + } + module yvals_h { + header "$msvc/yvals.h" + export * + } + module yvals_core_h { + header "$msvc/yvals_core.h" + export * + } } module sys_stage2 [system] [extern_c] {
diff --git a/buildtools/deps_revisions.gni b/buildtools/deps_revisions.gni index 604d4a0ce..fdaa644 100644 --- a/buildtools/deps_revisions.gni +++ b/buildtools/deps_revisions.gni
@@ -5,5 +5,5 @@ declare_args() { # Used to cause full rebuilds on libc++ rolls. This should be kept in sync # with the libcxx_revision var in //DEPS. - libcxx_revision = "e39a56726813663b378f05bd3096cbde2ec92ce7" + libcxx_revision = "bcc74d7745a74dae059f1a4ca97e2979f5f77661" }
diff --git a/buildtools/third_party/libc++/libcxx_headers.gni b/buildtools/third_party/libc++/libcxx_headers.gni index c106fbff..89c1cab 100644 --- a/buildtools/third_party/libc++/libcxx_headers.gni +++ b/buildtools/third_party/libc++/libcxx_headers.gni
@@ -11,7 +11,7 @@ import("//buildtools/deps_revisions.gni") assert( - libcxx_revision == "e39a56726813663b378f05bd3096cbde2ec92ce7", + libcxx_revision == "bcc74d7745a74dae059f1a4ca97e2979f5f77661", "libcxx_headers.gni and third_party/libc++ are out of sync.$0x0A$0x0AIf you were messing around with the libc++ repository, run:$0x0A`buildtools/third_party/libc++/generate_libcxx_headers.py`$0x0A$0x0AIf the script doesn't resolve the error, file a bug to msta@ with reproduction details.$0x0A") libcxx_headers = [
diff --git a/cc/metrics/compositor_frame_reporting_controller_unittest.cc b/cc/metrics/compositor_frame_reporting_controller_unittest.cc index 5d63c72a..15aca58e 100644 --- a/cc/metrics/compositor_frame_reporting_controller_unittest.cc +++ b/cc/metrics/compositor_frame_reporting_controller_unittest.cc
@@ -1010,6 +1010,44 @@ 1); } +TEST_F(CompositorFrameReportingControllerTest, VizBreakdown) { + base::HistogramTester histogram_tester; + + SimulateSubmitCompositorFrame({}); + viz::FrameTimingDetails viz_details = BuildVizBreakdown(); + reporting_controller_.DidPresentCompositorFrame(*current_token_, viz_details); + + // Check that the viz timestamps were set corresponding to the values + // in BuildVizBreakdown. + histogram_tester.ExpectUniqueSample( + "CompositorLatency2.EndActivateToSubmitCompositorFrame", 10, 1); + histogram_tester.ExpectUniqueSample( + "CompositorLatency2.SubmitCompositorFrameToPresentationCompositorFrame." + "SubmitToReceiveCompositorFrame", + 1, 1); + histogram_tester.ExpectUniqueSample( + "CompositorLatency2.SubmitCompositorFrameToPresentationCompositorFrame." + "ReceivedCompositorFrameToStartDraw", + 2, 1); + histogram_tester.ExpectUniqueSample( + "CompositorLatency2.SubmitCompositorFrameToPresentationCompositorFrame." + "StartDrawToSwapStart", + 3, 1); + histogram_tester.ExpectUniqueSample( + "CompositorLatency2.SubmitCompositorFrameToPresentationCompositorFrame." + "SwapStartToSwapEnd", + 4, 1); + histogram_tester.ExpectUniqueSample( + "CompositorLatency2.SubmitCompositorFrameToPresentationCompositorFrame." + "SwapEndToPresentationCompositorFrame", + 5, 1); + + // Expect the total latency to be equal to the sum of the stages. + histogram_tester.ExpectUniqueSample( + "CompositorLatency2.SubmitCompositorFrameToPresentationCompositorFrame", + 1 + 2 + 3 + 4 + 5, 1); +} + class TreesInVizClientCompositorFrameReportingControllerTest : public CompositorFrameReportingControllerTest { public:
diff --git a/cc/tiles/gpu_image_decode_cache.cc b/cc/tiles/gpu_image_decode_cache.cc index 72d88a7a1..9f59da2 100644 --- a/cc/tiles/gpu_image_decode_cache.cc +++ b/cc/tiles/gpu_image_decode_cache.cc
@@ -369,22 +369,6 @@ return true; } -// Takes ownership of the backing texture of an SkImage. This allows us to -// delete this texture under Skia (via discardable). -// TODO(crbug.com/391648152): Remove this method entirely, as it is no longer -// relevant post-OOP-C. -sk_sp<SkImage> TakeOwnershipOfSkImageBacking(GrDirectContext* context, - sk_sp<SkImage> image) { - // If the image is not texture backed, it has no backing, just return it. - if (!image->isTextureBacked()) { - return image; - } - - // It is not possible to fulfill this operation post-OOP-C as `context` is - // always nullptr. - return nullptr; -} - // We use this below, instead of just a std::unique_ptr, so that we can run // a Finch experiment to check the impact of not using discardable memory on the // GPU decode path. @@ -913,56 +897,6 @@ DCHECK(!gl_plane_ids_); } -void GpuImageDecodeCache::UploadedImageData::SetImage( - sk_sp<SkImage> image, - bool represents_yuv_image) { - DCHECK(mode_ == Mode::kNone); - DCHECK(!image_); - DCHECK(!transfer_cache_id_); - DCHECK(image); - - mode_ = Mode::kSkImage; - image_ = std::move(image); - // Calling isTexturedBacked() on the YUV SkImage would flatten it to RGB. - if (!represents_yuv_image && image_->isTextureBacked()) { - gl_id_ = GlIdFromSkImage(image_.get()); - } else { - gl_id_ = 0; - } - OnSetLockedData(false /* out_of_raster */); -} - -void GpuImageDecodeCache::UploadedImageData::SetYuvImage( - sk_sp<SkImage> y_image_input, - sk_sp<SkImage> u_image_input, - sk_sp<SkImage> v_image_input) { - DCHECK(!image_yuv_planes_); - DCHECK(!gl_plane_ids_); - DCHECK(!transfer_cache_id_); - DCHECK(y_image_input); - DCHECK(u_image_input); - DCHECK(v_image_input); - - mode_ = Mode::kSkImage; - image_yuv_planes_ = std::array<sk_sp<SkImage>, kNumYUVPlanes>(); - image_yuv_planes_->at(static_cast<size_t>(YUVIndex::kY)) = - std::move(y_image_input); - image_yuv_planes_->at(static_cast<size_t>(YUVIndex::kU)) = - std::move(u_image_input); - image_yuv_planes_->at(static_cast<size_t>(YUVIndex::kV)) = - std::move(v_image_input); - if (y_image()->isTextureBacked() && u_image()->isTextureBacked() && - v_image()->isTextureBacked()) { - gl_plane_ids_ = std::array<GrGLuint, kNumYUVPlanes>(); - gl_plane_ids_->at(static_cast<size_t>(YUVIndex::kY)) = - GlIdFromSkImage(y_image().get()); - gl_plane_ids_->at(static_cast<size_t>(YUVIndex::kU)) = - GlIdFromSkImage(u_image().get()); - gl_plane_ids_->at(static_cast<size_t>(YUVIndex::kV)) = - GlIdFromSkImage(v_image().get()); - } -} - void GpuImageDecodeCache::UploadedImageData::SetTransferCacheId(uint32_t id) { DCHECK(mode_ == Mode::kNone); DCHECK(!image_); @@ -1021,7 +955,6 @@ GpuImageDecodeCache::ImageData::ImageData( PaintImage::Id paint_image_id_param, - DecodedDataMode mode, const gfx::ColorSpace& target_color_space, PaintFlags::FilterQuality quality, int upload_scale_mip_level_param, @@ -1032,7 +965,6 @@ bool speculative_decode, base::span<ImageInfo, kAuxImageCount> image_info) : paint_image_id(paint_image_id_param), - mode(mode), target_color_space(target_color_space), quality(quality), upload_scale_mip_level(upload_scale_mip_level_param), @@ -1080,28 +1012,8 @@ speculative_decode_usage_stats_.reset(); } -bool GpuImageDecodeCache::ImageData::IsGpuOrTransferCache() const { - return mode == DecodedDataMode::kGpu || - mode == DecodedDataMode::kTransferCache; -} - bool GpuImageDecodeCache::ImageData::HasUploadedData() const { - switch (mode) { - case DecodedDataMode::kGpu: - // upload.image() stores the result of MakeFromYUVATextures - if (upload.image()) { - // TODO(crbug.com/41432265): Be smarter about being able to re-upload - // planes selectively if only some get deleted from under us. - DCHECK(!info.yuva.has_value() || upload.has_yuv_planes()); - return true; - } - return false; - case DecodedDataMode::kTransferCache: - return !!upload.transfer_cache_id(); - case DecodedDataMode::kCpu: - return false; - } - return false; + return !!upload.transfer_cache_id(); } void GpuImageDecodeCache::ImageData::ValidateBudgeted() const { @@ -1122,23 +1034,6 @@ //////////////////////////////////////////////////////////////////////////////// // GpuImageDecodeCache -// static -GrGLuint GpuImageDecodeCache::GlIdFromSkImage(const SkImage* image) { - DCHECK(image->isTextureBacked()); - GrBackendTexture backend_texture; - if (!SkImages::GetBackendTextureFromImage( - image, &backend_texture, true /* flushPendingGrContextIO */)) { - return 0; - } - - GrGLTextureInfo info; - if (!GrBackendTextures::GetGLTextureInfo(backend_texture, &info)) { - return 0; - } - - return info.fID; -} - GpuImageDecodeCache::GpuImageDecodeCache( viz::RasterContextProvider* context, SkColorType color_type, @@ -1163,16 +1058,14 @@ DCHECK_NE(generator_client_id_, PaintImage::kDefaultGeneratorClientId); // Note that to compute |allow_accelerated_jpeg_decodes_| and // |allow_accelerated_webp_decodes_|, the last thing we check is the feature - // flag. That's because we want to ensure that we're in OOP-R mode and the - // hardware decoder supports the image type so that finch experiments - // involving hardware decode acceleration only count users in that - // population (both in the 'control' and the 'enabled' groups). + // flag. That's because we want to ensure that the hardware decoder supports + // the image type so that finch experiments involving hardware decode + // acceleration only count users in that population (both in the 'control' + // and the 'enabled' groups). allow_accelerated_jpeg_decodes_ = - use_transfer_cache_ && context_->ContextSupport()->IsJpegDecodeAccelerationSupported() && base::FeatureList::IsEnabled(features::kVaapiJpegImageDecodeAcceleration); allow_accelerated_webp_decodes_ = - use_transfer_cache_ && context_->ContextSupport()->IsWebPDecodeAccelerationSupported() && base::FeatureList::IsEnabled(features::kVaapiWebPImageDecodeAcceleration); @@ -1463,35 +1356,19 @@ dark_mode_color_filter = it->second; } - if (image_data->mode == DecodedDataMode::kTransferCache) { - DCHECK(use_transfer_cache_); - auto id = image_data->upload.transfer_cache_id(); - if (id) - image_data->upload.mark_used(); - DCHECK(id || image_data->decode.decode_failure); - - SkSize scale_factor = CalculateScaleFactorForMipLevel( - draw_image, AuxImage::kDefault, image_data->upload_scale_mip_level); - DecodedDrawImage decoded_draw_image( - id, std::move(dark_mode_color_filter), SkSize(), scale_factor, - CalculateDesiredFilterQuality(draw_image), image_data->needs_mips, - image_data->is_budgeted); - return decoded_draw_image; - } else { - DCHECK(!use_transfer_cache_); - sk_sp<SkImage> image = image_data->upload.image(); - if (image) - image_data->upload.mark_used(); - DCHECK(image || image_data->decode.decode_failure); - - SkSize scale_factor = CalculateScaleFactorForMipLevel( - draw_image, AuxImage::kDefault, image_data->upload_scale_mip_level); - DecodedDrawImage decoded_draw_image( - std::move(image), std::move(dark_mode_color_filter), SkSize(), - scale_factor, CalculateDesiredFilterQuality(draw_image), - image_data->is_budgeted); - return decoded_draw_image; + auto id = image_data->upload.transfer_cache_id(); + if (id) { + image_data->upload.mark_used(); } + DCHECK(id || image_data->decode.decode_failure); + + SkSize scale_factor = CalculateScaleFactorForMipLevel( + draw_image, AuxImage::kDefault, image_data->upload_scale_mip_level); + DecodedDrawImage decoded_draw_image( + id, std::move(dark_mode_color_filter), SkSize(), scale_factor, + CalculateDesiredFilterQuality(draw_image), image_data->needs_mips, + image_data->is_budgeted); + return decoded_draw_image; } void GpuImageDecodeCache::DrawWithImageFinished( @@ -1829,58 +1706,15 @@ // If we have an uploaded image (that is actually on the GPU, not just a // CPU wrapper), upload it here. if (image_data->HasUploadedData()) { - switch (image_data->mode) { - case DecodedDataMode::kGpu: { - // The GPU path does not support auxiliary images, so we can assume - // that this is the default image. - const auto& info = image_data->info; - size_t discardable_size = info.size; - auto* context_support = context_->ContextSupport(); - // If the discardable system has deleted this out from under us, log a - // size of 0 to match software discardable. - if (info.yuva.has_value() && - context_support->ThreadsafeDiscardableTextureIsDeletedForTracing( - image_data->upload.gl_y_id()) && - context_support->ThreadsafeDiscardableTextureIsDeletedForTracing( - image_data->upload.gl_u_id()) && - context_support->ThreadsafeDiscardableTextureIsDeletedForTracing( - image_data->upload.gl_v_id())) { - discardable_size = 0; - } else if (context_support - ->ThreadsafeDiscardableTextureIsDeletedForTracing( - image_data->upload.gl_id())) { - discardable_size = 0; - } - - std::string gpu_dump_base_name = base::StringPrintf( - "%s/gpu/image_%d", dump_name.c_str(), image_id); - size_t locked_size = - image_data->upload.is_locked() ? discardable_size : 0u; - if (info.yuva.has_value()) { - MemoryDumpYUVImage(pmd, image_data, gpu_dump_base_name, - locked_size); - } else { - AddTextureDump(pmd, gpu_dump_base_name, discardable_size, - image_data->upload.gl_id(), locked_size); - } - } break; - case DecodedDataMode::kTransferCache: { - // TODO(lizeb): Include the right ID to link it with the GPU-side - // resource. - std::string uploaded_dump_name = base::StringPrintf( - "%s/gpu/image_%d", dump_name.c_str(), - image_data->upload.transfer_cache_id().value()); - MemoryAllocatorDump* dump = - pmd->CreateAllocatorDump(uploaded_dump_name); - dump->AddScalar(MemoryAllocatorDump::kNameSize, - MemoryAllocatorDump::kUnitsBytes, - image_data->GetTotalSize()); - } break; - - case DecodedDataMode::kCpu: - // Not uploaded in this case. - NOTREACHED(); - } + // TODO(lizeb): Include the right ID to link it with the GPU-side + // resource. + std::string uploaded_dump_name = + base::StringPrintf("%s/gpu/image_%d", dump_name.c_str(), + image_data->upload.transfer_cache_id().value()); + MemoryAllocatorDump* dump = pmd->CreateAllocatorDump(uploaded_dump_name); + dump->AddScalar(MemoryAllocatorDump::kNameSize, + MemoryAllocatorDump::kUnitsBytes, + image_data->GetTotalSize()); } } @@ -1908,9 +1742,6 @@ if (context_->GetLock()) context_lock.emplace(context_); - std::optional<ScopedGrContextAccess> gr_context_access; - if (!use_transfer_cache_) - gr_context_access.emplace(context_); base::AutoLock lock(lock_); auto cache_key = InUseCacheKeyFromDrawImage(draw_image); @@ -2172,7 +2003,6 @@ // of the cpu fallback (in case we don't find this image in gpu memory) is // too low to cache this data. if (image_data->decode.ref_count == 0 && - image_data->mode != DecodedDataMode::kCpu && image_data->HasUploadedData()) { image_data->decode.ResetData(); image_data->speculative_decode_usage_stats_.reset(); @@ -2180,8 +2010,7 @@ // If we have no refs on an uploaded image, it should be unlocked. Do this // before any attempts to delete the image. - if (image_data->IsGpuOrTransferCache() && image_data->upload.ref_count == 0 && - image_data->upload.is_locked()) { + if (image_data->upload.ref_count == 0 && image_data->upload.is_locked()) { UnlockImage(image_data); } @@ -2190,13 +2019,6 @@ DeleteImage(image_data); } - // Don't keep CPU images if they are unused, these images can be recreated by - // re-locking discardable (rather than requiring a full upload like GPU - // images). - if (image_data->mode == DecodedDataMode::kCpu && !has_any_refs) { - DeleteImage(image_data); - } - // If we have image that could be budgeted, but isn't, budget it now. if (has_any_refs && !image_data->is_budgeted && CanFitInWorkingSet(image_data->GetTotalSize())) { @@ -2227,10 +2049,7 @@ #if DCHECK_IS_ON() // Sanity check the above logic. - if (image_data->HasUploadedData()) { - if (image_data->mode == DecodedDataMode::kCpu) - DCHECK(image_data->decode.is_locked()); - } else { + if (!image_data->HasUploadedData()) { DCHECK(!image_data->is_budgeted || has_any_refs); } #endif @@ -2445,8 +2264,8 @@ } else { // Decode as RGB. DCHECK(info.rgba.has_value()); - SkImageInfo image_info = info.rgba->makeColorSpace( - ColorSpaceForImageDecode(draw_image, image_data->mode)); + SkImageInfo image_info = + info.rgba->makeColorSpace(ColorSpaceForImageDecode(draw_image)); SkPixmap pixmap(image_info, backing_memory->data(), image_info.minRowBytes()); if (DrawAndScaleImageRGB(draw_image, aux_image, pixmap, @@ -2572,47 +2391,28 @@ // conversions or that some color conversion might have happened at decode // time. sk_sp<SkColorSpace> decoded_color_space = - ColorSpaceForImageDecode(draw_image, image_data->mode); + ColorSpaceForImageDecode(draw_image); if (target_color_space && decoded_color_space && SkColorSpace::Equals(target_color_space.get(), decoded_color_space.get())) { target_color_space = nullptr; } - if (image_data->mode == DecodedDataMode::kTransferCache) { - DCHECK(use_transfer_cache_); - if (image_data->decode.do_hardware_accelerated_decode()) { - UploadImageIfNecessary_TransferCache_HardwareDecode( - draw_image, image_data, target_color_space); - } else { - // Do not color convert images that are YUV or might be tone mapped. - if (image_data->info.yuva.has_value() || - draw_image.paint_image().HasGainmapInfo() || - ToneMapUtil::UseGlobalToneMapFilter(decoded_color_space.get())) { - target_color_space = nullptr; - } - const std::optional<gfx::HDRMetadata> hdr_metadata = - draw_image.paint_image().GetHDRMetadata(); - - UploadImageIfNecessary_TransferCache_SoftwareDecode( - draw_image, image_data, decoded_color_space, hdr_metadata, - target_color_space); - } + if (image_data->decode.do_hardware_accelerated_decode()) { + UploadImageIfNecessary_TransferCache_HardwareDecode(draw_image, image_data, + target_color_space); } else { - // Grab a reference to our decoded image. For the kCpu path, we will use - // this directly as our "uploaded" data. - sk_sp<SkImage> uploaded_image = - image_data->decode.image(0, AuxImage::kDefault); - skgpu::Mipmapped image_needs_mips = - image_data->needs_mips ? skgpu::Mipmapped::kYes : skgpu::Mipmapped::kNo; - - if (image_data->info.yuva.has_value()) { - UploadImageIfNecessary_GpuCpu_YUVA(draw_image, image_data, uploaded_image, - image_needs_mips, decoded_color_space, - target_color_space); - } else { - UploadImageIfNecessary_GpuCpu_RGBA(draw_image, image_data, uploaded_image, - image_needs_mips, target_color_space); + // Do not color convert images that are YUV or might be tone mapped. + if (image_data->info.yuva.has_value() || + draw_image.paint_image().HasGainmapInfo() || + ToneMapUtil::UseGlobalToneMapFilter(decoded_color_space.get())) { + target_color_space = nullptr; } + const std::optional<gfx::HDRMetadata> hdr_metadata = + draw_image.paint_image().GetHDRMetadata(); + + UploadImageIfNecessary_TransferCache_SoftwareDecode( + draw_image, image_data, decoded_color_space, hdr_metadata, + target_color_space); } } @@ -2620,8 +2420,6 @@ const DrawImage& draw_image, ImageData* image_data, sk_sp<SkColorSpace> color_space) { - DCHECK_EQ(image_data->mode, DecodedDataMode::kTransferCache); - DCHECK(use_transfer_cache_); DCHECK(image_data->decode.do_hardware_accelerated_decode()); // The assumption is that scaling is not currently supported for @@ -2665,8 +2463,6 @@ sk_sp<SkColorSpace> decoded_color_space, const std::optional<gfx::HDRMetadata>& hdr_metadata, sk_sp<SkColorSpace> target_color_space) { - DCHECK_EQ(image_data->mode, DecodedDataMode::kTransferCache); - DCHECK(use_transfer_cache_); DCHECK(!image_data->decode.do_hardware_accelerated_decode()); std::array<ClientImageTransferCacheEntry::Image, kAuxImageCount> image; @@ -2710,114 +2506,6 @@ InsertTransferCacheEntry(image_entry, image_data); } -void GpuImageDecodeCache::UploadImageIfNecessary_GpuCpu_YUVA( - const DrawImage& draw_image, - ImageData* image_data, - sk_sp<SkImage> uploaded_image, - skgpu::Mipmapped image_needs_mips, - sk_sp<SkColorSpace> decoded_color_space, - sk_sp<SkColorSpace> color_space) { - DCHECK(!use_transfer_cache_); - DCHECK(image_data->info.yuva.has_value()); - - // Grab a reference to our decoded image. For the kCpu path, we will use - // this directly as our "uploaded" data. This path only supports tri-planar - // YUV with no alpha. - DCHECK_EQ(image_data->info.yuva->yuvaInfo().planeConfig(), - SkYUVAInfo::PlaneConfig::kY_U_V); - sk_sp<SkImage> uploaded_y_image = - image_data->decode.image(0, AuxImage::kDefault); - sk_sp<SkImage> uploaded_u_image = - image_data->decode.image(1, AuxImage::kDefault); - sk_sp<SkImage> uploaded_v_image = - image_data->decode.image(2, AuxImage::kDefault); - - // Prevent image_data from being deleted while lock is not held. - scoped_refptr<ImageData> image_data_holder(image_data); - - if (image_data->mode == DecodedDataMode::kGpu) { - // This codepath is no longer supported post-OOP-R. - // TODO(crbug.com/391648152): Once `use_transfer_cache_` is always true, - // confirm that this entire method can be eliminated and do so. - return; - } - - // At-raster may have decoded this while we were unlocked. If so, ignore our - // result. - if (image_data->HasUploadedData()) { - if (uploaded_image) { - DCHECK(uploaded_y_image); - DCHECK(uploaded_u_image); - DCHECK(uploaded_v_image); - } - return; - } - - // TODO(crbug.com/41329554): |uploaded_image| is sometimes null in certain - // context-lost situations, so it is handled with an early out. - if (!uploaded_image || !uploaded_y_image || !uploaded_u_image || - !uploaded_v_image) { - DLOG(WARNING) << "TODO(crbug.com/41329554): Context was lost. Early out."; - return; - } - - uploaded_y_image = TakeOwnershipOfSkImageBacking(context_->GrContext(), - std::move(uploaded_y_image)); - uploaded_u_image = TakeOwnershipOfSkImageBacking(context_->GrContext(), - std::move(uploaded_u_image)); - uploaded_v_image = TakeOwnershipOfSkImageBacking(context_->GrContext(), - std::move(uploaded_v_image)); - - image_data->upload.SetImage(std::move(uploaded_image), - image_data->info.yuva.has_value()); - image_data->upload.SetYuvImage(std::move(uploaded_y_image), - std::move(uploaded_u_image), - std::move(uploaded_v_image)); -} - -void GpuImageDecodeCache::UploadImageIfNecessary_GpuCpu_RGBA( - const DrawImage& draw_image, - ImageData* image_data, - sk_sp<SkImage> uploaded_image, - skgpu::Mipmapped image_needs_mips, - sk_sp<SkColorSpace> color_space) { - DCHECK(!use_transfer_cache_); - DCHECK(!image_data->info.yuva.has_value()); - - // Prevent image_data from being deleted while lock is not held. - scoped_refptr<ImageData> image_data_holder(image_data); - - // Following OOP-R, it is no longer possible to call this method with mode - // `kGpu`. - // TODO(crbug.com/391648152): Remove the kGpu mode entirely post-verification - // that it is no longer used. - CHECK(image_data->mode != DecodedDataMode::kGpu); - - // RGBX decoding is below. - - // At-raster may have decoded this while we were unlocked. If so, ignore our - // result. - if (image_data->upload.image()) { - return; - } - - // Take ownership of any GL texture backing for the SkImage. This allows - // us to use the image with the discardable system. - if (uploaded_image) { - uploaded_image = TakeOwnershipOfSkImageBacking(context_->GrContext(), - std::move(uploaded_image)); - } - - // TODO(crbug.com/41329554): uploaded_image is sometimes null in certain - // context-lost situations. - if (!uploaded_image) { - DLOG(WARNING) << "TODO(crbug.com/41329554): Context was lost. Early out."; - return; - } - - image_data->upload.SetImage(std::move(uploaded_image)); -} - scoped_refptr<GpuImageDecodeCache::ImageData> GpuImageDecodeCache::CreateImageData(const DrawImage& draw_image, bool allow_hardware_decode, @@ -2852,13 +2540,9 @@ sk_image_info.height() > max_texture_size_ || (has_gainmap && (gainmap_sk_image_info.width() > max_texture_size_ || gainmap_sk_image_info.height() > max_texture_size_)); - // TODO(crbug.com/391648152): Remove DecodedDataMode entirely, as it is now - // always kTransferCache. - DecodedDataMode mode = DecodedDataMode::kTransferCache; - // We need to cache the result of color conversion on the cpu if the image // will be color converted during the decode. - auto decode_color_space = ColorSpaceForImageDecode(draw_image, mode); + auto decode_color_space = ColorSpaceForImageDecode(draw_image); const bool cache_color_conversion_on_cpu = decode_color_space && !SkColorSpace::Equals(decode_color_space.get(), @@ -2891,8 +2575,7 @@ draw_image.paint_image().GetImageHeaderMetadata(); bool can_do_hardware_accelerated_decode = false; bool do_hardware_accelerated_decode = false; - if (allow_hardware_decode && mode == DecodedDataMode::kTransferCache && - upload_scale_mip_level == 0 && !has_gainmap && + if (allow_hardware_decode && upload_scale_mip_level == 0 && !has_gainmap && context_->ContextSupport()->CanDecodeWithHardwareAcceleration( image_metadata)) { DCHECK(image_metadata); @@ -2919,8 +2602,7 @@ // Determine if we will do YUVA decoding for the image and the gainmap, and // update `image_info` to reflect that. - if (!do_hardware_accelerated_decode && mode != DecodedDataMode::kCpu && - !image_larger_than_max_texture) { + if (!do_hardware_accelerated_decode && !image_larger_than_max_texture) { auto yuva_info = GetYUVADecodeInfo(draw_image, AuxImage::kDefault, sk_image_info.dimensions(), yuva_supported_data_types_); @@ -2939,8 +2621,7 @@ } return base::WrapRefCounted(new ImageData( - draw_image.paint_image().stable_id(), mode, - draw_image.target_color_space(), + draw_image.paint_image().stable_id(), draw_image.target_color_space(), CalculateDesiredFilterQuality(draw_image), upload_scale_mip_level, needs_mips, is_bitmap_backed, can_do_hardware_accelerated_decode, do_hardware_accelerated_decode, speculative_decode, image_info)); @@ -2999,125 +2680,26 @@ void GpuImageDecodeCache::DeleteImage(ImageData* image_data) { if (image_data->HasUploadedData()) { DCHECK(!image_data->upload.is_locked()); - if (image_data->mode == DecodedDataMode::kGpu) { - if (image_data->info.yuva.has_value()) { - images_pending_deletion_.push_back(image_data->upload.y_image()); - images_pending_deletion_.push_back(image_data->upload.u_image()); - images_pending_deletion_.push_back(image_data->upload.v_image()); - yuv_images_pending_deletion_.push_back(image_data->upload.image()); - } else { - images_pending_deletion_.push_back(image_data->upload.image()); - } - } - if (image_data->mode == DecodedDataMode::kTransferCache) - ids_pending_deletion_.push_back(*image_data->upload.transfer_cache_id()); + ids_pending_deletion_.push_back(*image_data->upload.transfer_cache_id()); } image_data->upload.Reset(); } void GpuImageDecodeCache::UnlockImage(ImageData* image_data) { DCHECK(image_data->HasUploadedData()); - if (image_data->mode == DecodedDataMode::kGpu) { - if (image_data->info.yuva.has_value()) { - images_pending_unlock_.push_back(image_data->upload.y_image().get()); - images_pending_unlock_.push_back(image_data->upload.u_image().get()); - images_pending_unlock_.push_back(image_data->upload.v_image().get()); - yuv_images_pending_unlock_.push_back(image_data->upload.image()); - } else { - images_pending_unlock_.push_back(image_data->upload.image().get()); - } - } else { - DCHECK(image_data->mode == DecodedDataMode::kTransferCache); - ids_pending_unlock_.push_back(*image_data->upload.transfer_cache_id()); - } + ids_pending_unlock_.push_back(*image_data->upload.transfer_cache_id()); image_data->upload.OnUnlock(); - - // If we were holding onto an unmipped image for deferring deletion, do it now - // it is guaranteed to have no-refs. - auto unmipped_image = image_data->upload.take_unmipped_image(); - if (unmipped_image) { - if (image_data->info.yuva.has_value()) { - auto unmipped_y_image = image_data->upload.take_unmipped_y_image(); - auto unmipped_u_image = image_data->upload.take_unmipped_u_image(); - auto unmipped_v_image = image_data->upload.take_unmipped_v_image(); - DCHECK(unmipped_y_image); - DCHECK(unmipped_u_image); - DCHECK(unmipped_v_image); - images_pending_deletion_.push_back(std::move(unmipped_y_image)); - images_pending_deletion_.push_back(std::move(unmipped_u_image)); - images_pending_deletion_.push_back(std::move(unmipped_v_image)); - yuv_images_pending_deletion_.push_back(std::move(unmipped_image)); - } else { - images_pending_deletion_.push_back(std::move(unmipped_image)); - } } -} -// YUV images are handled slightly differently because they are not themselves -// registered with the discardable memory system. We cannot use -// GlIdFromSkImage on these YUV SkImages to flush pending operations because -// doing so will flatten it to RGB. -void GpuImageDecodeCache::FlushYUVImages( - std::vector<sk_sp<SkImage>>* yuv_images) { - CheckContextLockAcquiredIfNecessary(); - GrDirectContext* ctx = context_->GrContext(); - for (auto& image : *yuv_images) { - ctx->flushAndSubmit(image); - } - yuv_images->clear(); -} - -// We always run pending operations in the following order: -// > Lock -// > Flush YUV images that will be unlocked -// > Unlock -// > Flush YUV images that will be deleted -// > Delete -// This ensures that: -// a) We never fully unlock an image that's pending lock (lock before unlock) -// b) We never delete an image that has pending locks/unlocks. -// c) We never unlock or delete the underlying texture planes for a YUV -// image before all operations referencing it have completed. -// -// As this can be run at-raster, to unlock/delete an image that was just used, -// we need to call GlIdFromSkImage, which flushes pending IO on the image, -// rather than just using a cached GL ID. -// YUV images are handled slightly differently because they are backed by -// texture images but are not themselves registered with the discardable memory -// system. We wait to delete the pointer to a YUV image until we have a context -// lock and its textures have been deleted. void GpuImageDecodeCache::RunPendingContextThreadOperations() { CheckContextLockAcquiredIfNecessary(); - for (SkImage* image : images_pending_complete_lock_) { - context_->ContextSupport()->CompleteLockDiscardableTexureOnContextThread( - GlIdFromSkImage(image)); - } - images_pending_complete_lock_.clear(); - - FlushYUVImages(&yuv_images_pending_unlock_); - for (SkImage* image : images_pending_unlock_) { - context_->RasterInterface()->UnlockDiscardableTextureCHROMIUM( - GlIdFromSkImage(image)); - } - images_pending_unlock_.clear(); - for (auto id : ids_pending_unlock_) { context_->ContextSupport()->UnlockTransferCacheEntries({std::make_pair( static_cast<uint32_t>(TransferCacheEntryType::kImage), id)}); } ids_pending_unlock_.clear(); - FlushYUVImages(&yuv_images_pending_deletion_); - for (auto& image : images_pending_deletion_) { - uint32_t texture_id = GlIdFromSkImage(image.get()); - if (context_->RasterInterface()->LockDiscardableTextureCHROMIUM( - texture_id)) { - context_->RasterInterface()->DeleteGpuRasterTexture(texture_id); - } - } - images_pending_deletion_.clear(); - for (auto id : ids_pending_deletion_) { if (context_->ContextSupport()->ThreadsafeLockTransferCacheEntry( static_cast<uint32_t>(TransferCacheEntryType::kImage), id)) { @@ -3169,70 +2751,12 @@ if (data->upload.is_locked()) return true; - if (data->mode == DecodedDataMode::kTransferCache) { - DCHECK(use_transfer_cache_); - DCHECK(data->upload.transfer_cache_id()); - if (context_->ContextSupport()->ThreadsafeLockTransferCacheEntry( - static_cast<uint32_t>(TransferCacheEntryType::kImage), - *data->upload.transfer_cache_id())) { - data->upload.OnLock(); - return true; - } - } else if (have_context_lock == HaveContextLock::kYes) { - auto* ri = context_->RasterInterface(); - // If |have_context_lock|, we can immediately lock the image and send - // the lock command to the GPU process. - // TODO(crbug.com/40606304): Add Chrome GL extension to upload texture - // array. - if (data->info.yuva.has_value() && - ri->LockDiscardableTextureCHROMIUM(data->upload.gl_y_id()) && - ri->LockDiscardableTextureCHROMIUM(data->upload.gl_u_id()) && - ri->LockDiscardableTextureCHROMIUM(data->upload.gl_v_id())) { - DCHECK(!use_transfer_cache_); - DCHECK(data->mode == DecodedDataMode::kGpu); - data->upload.OnLock(); - return true; - } else if (!data->info.yuva.has_value() && - ri->LockDiscardableTextureCHROMIUM(data->upload.gl_id())) { - DCHECK(!use_transfer_cache_); - DCHECK(data->mode == DecodedDataMode::kGpu); - data->upload.OnLock(); - return true; - } - } else { - // If !|have_context_lock|, we use - // ThreadsafeShallowLockDiscardableTexture. This takes a reference to the - // image, ensuring that it can't be deleted by the service, but delays - // sending a lock command over the command buffer. This command must be - // sent before the image is used, but is now guaranteed to succeed. We - // will send this command via - // CompleteLockDiscardableTextureOnContextThread in - // UploadImageIfNecessary, which is guaranteed to run before the texture - // is used. - auto* context_support = context_->ContextSupport(); - if (data->info.yuva.has_value() && - context_support->ThreadSafeShallowLockDiscardableTexture( - data->upload.gl_y_id()) && - context_support->ThreadSafeShallowLockDiscardableTexture( - data->upload.gl_u_id()) && - context_support->ThreadSafeShallowLockDiscardableTexture( - data->upload.gl_v_id())) { - DCHECK(!use_transfer_cache_); - DCHECK(data->mode == DecodedDataMode::kGpu); - data->upload.OnLock(); - images_pending_complete_lock_.push_back(data->upload.y_image().get()); - images_pending_complete_lock_.push_back(data->upload.u_image().get()); - images_pending_complete_lock_.push_back(data->upload.v_image().get()); - return true; - } else if (!data->info.yuva.has_value() && - context_support->ThreadSafeShallowLockDiscardableTexture( - data->upload.gl_id())) { - DCHECK(!use_transfer_cache_); - DCHECK(data->mode == DecodedDataMode::kGpu); - data->upload.OnLock(); - images_pending_complete_lock_.push_back(data->upload.image().get()); - return true; - } + DCHECK(data->upload.transfer_cache_id()); + if (context_->ContextSupport()->ThreadsafeLockTransferCacheEntry( + static_cast<uint32_t>(TransferCacheEntryType::kImage), + *data->upload.transfer_cache_id())) { + data->upload.OnLock(); + return true; } // Couldn't lock, abandon the image. @@ -3475,8 +2999,7 @@ } sk_sp<SkColorSpace> GpuImageDecodeCache::ColorSpaceForImageDecode( - const DrawImage& image, - DecodedDataMode mode) const { + const DrawImage& image) const { if (!SupportsColorSpaceConversion()) return nullptr; @@ -3491,50 +3014,6 @@ context_->GetLock()->AssertAcquired(); } -sk_sp<SkImage> GpuImageDecodeCache::CreateImageFromYUVATexturesInternal( - const SkImage* uploaded_y_image, - const SkImage* uploaded_u_image, - const SkImage* uploaded_v_image, - const int image_width, - const int image_height, - const SkYUVAInfo::PlaneConfig yuva_plane_config, - const SkYUVAInfo::Subsampling yuva_subsampling, - const SkYUVColorSpace yuv_color_space, - sk_sp<SkColorSpace> target_color_space, - sk_sp<SkColorSpace> decoded_color_space) const { - DCHECK(uploaded_y_image); - DCHECK(uploaded_u_image); - DCHECK(uploaded_v_image); - SkYUVAInfo yuva_info({image_width, image_height}, yuva_plane_config, - yuva_subsampling, yuv_color_space); - GrBackendTexture yuv_textures[3]{}; - CHECK(SkImages::GetBackendTextureFromImage(uploaded_y_image, &yuv_textures[0], - false)); - CHECK(SkImages::GetBackendTextureFromImage(uploaded_u_image, &yuv_textures[1], - false)); - CHECK(SkImages::GetBackendTextureFromImage(uploaded_v_image, &yuv_textures[2], - false)); - GrYUVABackendTextures yuva_backend_textures(yuva_info, yuv_textures, - kTopLeft_GrSurfaceOrigin); - DCHECK(yuva_backend_textures.isValid()); - - if (target_color_space && SkColorSpace::Equals(target_color_space.get(), - decoded_color_space.get())) { - target_color_space = nullptr; - } - - GrDirectContext* gr_context = context_->GrContext(); - CHECK(gr_context); - sk_sp<SkImage> yuva_image = SkImages::TextureFromYUVATextures( - gr_context, yuva_backend_textures, std::move(decoded_color_space)); - if (target_color_space && yuva_image) { - return yuva_image->makeColorSpace(gr_context->asRecorder(), - target_color_space, {}); - } - - return yuva_image; -} - // static scoped_refptr<TileTask> GpuImageDecodeCache::GetTaskFromMapForClientId( const ClientId client_id,
diff --git a/cc/tiles/gpu_image_decode_cache.h b/cc/tiles/gpu_image_decode_cache.h index fdb19084..6446c7f 100644 --- a/cc/tiles/gpu_image_decode_cache.h +++ b/cc/tiles/gpu_image_decode_cache.h
@@ -154,9 +154,6 @@ RasterDarkModeFilter* const dark_mode_filter); ~GpuImageDecodeCache() override; - // Returns the GL texture ID backing the given SkImage. - static GrGLuint GlIdFromSkImage(const SkImage* image); - static base::TimeDelta get_purge_interval(); static base::TimeDelta get_max_purge_age(); @@ -255,7 +252,6 @@ void ReleaseContextLockForTesting(); private: - enum class DecodedDataMode { kGpu, kCpu, kTransferCache }; using ImageTaskMap = base::flat_map<ClientId, scoped_refptr<TileTask>>; // Stores stats tracked by both DecodedImageData and UploadedImageData. @@ -424,12 +420,6 @@ UploadedImageData(); ~UploadedImageData(); - // If |represents_yuv_image| is true, the method knows not to check for a - // texture ID for |image|, which would inadvertently flatten it to RGB. - void SetImage(sk_sp<SkImage> image, bool represents_yuv_image = false); - void SetYuvImage(sk_sp<SkImage> y_image_input, - sk_sp<SkImage> u_image_input, - sk_sp<SkImage> v_image_input); void SetTransferCacheId(uint32_t id); void Reset(); @@ -481,49 +471,6 @@ return transfer_cache_id_; } - void set_unmipped_image(sk_sp<SkImage> image) { - unmipped_image_ = std::move(image); - } - sk_sp<SkImage> take_unmipped_image() { - DCHECK(!is_locked_); - return std::move(unmipped_image_); - } - - void set_unmipped_yuv_images(sk_sp<SkImage> y_image, - sk_sp<SkImage> u_image, - sk_sp<SkImage> v_image) { - if (!unmipped_yuv_images_) { - unmipped_yuv_images_ = YUVSkImages(); - } - unmipped_yuv_images_->at(static_cast<size_t>(YUVIndex::kY)) = - std::move(y_image); - unmipped_yuv_images_->at(static_cast<size_t>(YUVIndex::kU)) = - std::move(u_image); - unmipped_yuv_images_->at(static_cast<size_t>(YUVIndex::kV)) = - std::move(v_image); - } - - sk_sp<SkImage> take_unmipped_y_image() { - return take_unmipped_yuv_image_internal(YUVIndex::kY); - } - - sk_sp<SkImage> take_unmipped_u_image() { - return take_unmipped_yuv_image_internal(YUVIndex::kU); - } - - sk_sp<SkImage> take_unmipped_v_image() { - return take_unmipped_yuv_image_internal(YUVIndex::kV); - } - - sk_sp<SkImage> take_unmipped_yuv_image_internal(const YUVIndex yuv_index) { - DCHECK(!is_locked_); - const size_t index = static_cast<size_t>(yuv_index); - if (unmipped_yuv_images_ && unmipped_yuv_images_->size() > index) { - return std::move(unmipped_yuv_images_->at(index)); - } - return nullptr; - } - private: // Used for internal DCHECKs only. enum class Mode { @@ -565,13 +512,6 @@ // Used if |mode_| == kTransferCache. std::optional<uint32_t> transfer_cache_id_; - - // The original un-mipped image, for RGBX, or the representative image - // backed by three planes for YUV. It is retained until it can be safely - // deleted. - sk_sp<SkImage> unmipped_image_; - // Used for YUV decoding and null otherwise. - std::optional<YUVSkImages> unmipped_yuv_images_; }; // A structure to represent either an RGBA or a YUVA image info. @@ -594,7 +534,6 @@ struct ImageData : public base::RefCountedThreadSafe<ImageData> { ImageData(PaintImage::Id paint_image_id, - DecodedDataMode mode, const gfx::ColorSpace& target_color_space, PaintFlags::FilterQuality quality, int upload_scale_mip_level, @@ -605,7 +544,6 @@ bool speculative_decode, base::span<ImageInfo, kAuxImageCount> image_info); - bool IsGpuOrTransferCache() const; bool HasUploadedData() const; void ValidateBudgeted() const; @@ -636,7 +574,6 @@ void RecordSpeculativeDecodeRasterTaskTakeover(); const PaintImage::Id paint_image_id; - const DecodedDataMode mode; const gfx::ColorSpace target_color_space; PaintFlags::FilterQuality quality; int upload_scale_mip_level; @@ -775,18 +712,6 @@ void GenerateDarkModeFilter(const DrawImage& draw_image, ImageData* image_data) EXCLUSIVE_LOCKS_REQUIRED(lock_); - sk_sp<SkImage> CreateImageFromYUVATexturesInternal( - const SkImage* uploaded_y_image, - const SkImage* uploaded_u_image, - const SkImage* uploaded_v_image, - const int image_width, - const int image_height, - const SkYUVAInfo::PlaneConfig yuva_plane_config, - const SkYUVAInfo::Subsampling yuva_subsampling, - const SkYUVColorSpace yuva_color_space, - sk_sp<SkColorSpace> target_color_space, - sk_sp<SkColorSpace> decoded_color_space) const - EXCLUSIVE_LOCKS_REQUIRED(lock_); scoped_refptr<GpuImageDecodeCache::ImageData> CreateImageData( const DrawImage& image, @@ -847,24 +772,6 @@ sk_sp<SkColorSpace> decoded_target_colorspace, const std::optional<gfx::HDRMetadata>& hdr_metadata, sk_sp<SkColorSpace> target_color_space) EXCLUSIVE_LOCKS_REQUIRED(lock_); - void UploadImageIfNecessary_GpuCpu_YUVA( - const DrawImage& draw_image, - ImageData* image_data, - sk_sp<SkImage> uploaded_image, - skgpu::Mipmapped image_needs_mips, - sk_sp<SkColorSpace> decoded_target_colorspace, - sk_sp<SkColorSpace> color_space) EXCLUSIVE_LOCKS_REQUIRED(lock_); - void UploadImageIfNecessary_GpuCpu_RGBA(const DrawImage& draw_image, - ImageData* image_data, - sk_sp<SkImage> uploaded_image, - skgpu::Mipmapped image_needs_mips, - sk_sp<SkColorSpace> color_space) - EXCLUSIVE_LOCKS_REQUIRED(lock_); - - // Flush pending operations on context_->GrContext() for each element of - // |yuv_images| and then clear the vector. - void FlushYUVImages(std::vector<sk_sp<SkImage>>* yuv_images) - EXCLUSIVE_LOCKS_REQUIRED(lock_); // Runs pending operations that required the |context_| lock to be held, but // were queued up during a time when the |context_| lock was unavailable. @@ -873,8 +780,7 @@ void CheckContextLockAcquiredIfNecessary(); - sk_sp<SkColorSpace> ColorSpaceForImageDecode(const DrawImage& image, - DecodedDataMode mode) const; + sk_sp<SkColorSpace> ColorSpaceForImageDecode(const DrawImage& image) const; // Helper function to add a memory dump to |pmd| for a single texture // identified by |gl_id| with size |bytes| and |locked_size| equal to either @@ -931,8 +837,6 @@ const SkColorType color_type_; - // TODO(crbug.com/391648152): Eliminate this ivar, as it's now always true. - const bool use_transfer_cache_ = true; raw_ptr<viz::RasterContextProvider> context_; int max_texture_size_ = 0; const PaintImage::GeneratorClientId generator_client_id_; @@ -985,17 +889,6 @@ // (TRACE_EVENT*), perfetto::TracedDictionary::Add and gmock/EXPECT_THAT. RAW_PTR_EXCLUSION RasterDarkModeFilter* const dark_mode_filter_; - // We can't modify GPU backed SkImages without holding the context lock, so - // we queue up operations to run the next time the lock is held. - std::vector<raw_ptr<SkImage, VectorExperimental>> - images_pending_complete_lock_; - std::vector<raw_ptr<SkImage, VectorExperimental>> images_pending_unlock_; - std::vector<sk_sp<SkImage>> images_pending_deletion_; - // Images that are backed by planar textures must be handled differently - // to avoid inadvertently flattening to RGB and creating additional textures. - // See comment in RunPendingContextThreadOperations(). - std::vector<sk_sp<SkImage>> yuv_images_pending_deletion_; - std::vector<sk_sp<SkImage>> yuv_images_pending_unlock_; const sk_sp<SkColorSpace> target_color_space_; std::vector<uint32_t> ids_pending_unlock_;
diff --git a/chrome/VERSION b/chrome/VERSION index e0fdcd27..108eea3 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=142 MINOR=0 -BUILD=7436 +BUILD=7437 PATCH=0
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabBubbler.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabBubbler.java index 6ffe39b..3a2904d 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabBubbler.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabBubbler.java
@@ -20,7 +20,6 @@ import java.util.HashSet; import java.util.List; import java.util.Objects; -import java.util.Optional; import java.util.Set; /** Pushes bubble/dot notifications for tabs. */ @@ -45,7 +44,7 @@ EitherGroupId eitherGroupId = EitherGroupId.createLocalId(localTabGroupId); List<PersistentMessage> messageList = mMessagingBackendService.getMessagesForGroup( - eitherGroupId, Optional.of(PersistentNotificationType.DIRTY_TAB)); + eitherGroupId, PersistentNotificationType.DIRTY_TAB); Set<Integer> tabIds = new HashSet<>(); for (PersistentMessage message : messageList) {
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabBubblerUnitTest.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabBubblerUnitTest.java index 8784420..6101c66 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabBubblerUnitTest.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabBubblerUnitTest.java
@@ -7,6 +7,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -91,7 +92,7 @@ @Test public void testShowAll_Added() { List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabBubbler.showAll(); @@ -105,7 +106,7 @@ PersistentMessage message = makeStandardMessage(); message.attribution.tabGroupMetadata.localTabGroupId = new LocalTabGroupId(GROUP_ID2); List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabBubbler.showAll(); verify(mTabListNotificationHandler, never()) @@ -117,7 +118,7 @@ PersistentMessage message = makeStandardMessage(); message.attribution.tabGroupMetadata.localTabGroupId = null; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabBubbler.showAll(); verify(mTabListNotificationHandler, never()) @@ -128,7 +129,7 @@ public void testShowAll_NullCurrentTabGroup() { mTabGroupIdSupplier.set(null); List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabBubbler.showAll(); verify(mTabListNotificationHandler, never()) @@ -140,7 +141,7 @@ PersistentMessage message = makeStandardMessage(); message.type = PersistentNotificationType.CHIP; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabBubbler.showAll(); verify(mTabListNotificationHandler, never()) @@ -152,7 +153,7 @@ PersistentMessage message = makeStandardMessage(); message.attribution.tabMetadata.localTabId = Tab.INVALID_TAB_ID; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabBubbler.showAll(); verify(mTabListNotificationHandler, never()) @@ -184,7 +185,7 @@ @Test public void testOnMessagingBackendServiceInitialized() { List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); verify(mMessagingBackendService) .addPersistentMessageObserver(mPersistentMessageObserverCaptor.capture());
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java index b805b08e..210c520 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
@@ -116,7 +116,6 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; -import java.util.Optional; import java.util.Set; import java.util.function.Supplier; @@ -1462,9 +1461,7 @@ assumeNonNull(mMessagingBackendService); List<PersistentMessage> messages = mMessagingBackendService.getMessagesForGroup( - eitherGroupId, - /* type= */ Optional.of(PersistentNotificationType.DIRTY_TAB)); - + eitherGroupId, /* type= */ PersistentNotificationType.DIRTY_TAB); Map<Integer, Integer> collaborationEventCounts = new HashMap<>(); for (PersistentMessage message : messages) { collaborationEventCounts.merge(message.collaborationEvent, 1, Integer::sum); @@ -1476,8 +1473,7 @@ // Query for tombstoned entries from backend and look for the tab removals. List<PersistentMessage> tombstonedMessages = - mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED)); + mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED); int tabsClosed = 0; for (PersistentMessage message : tombstonedMessages) { if (message.collaborationEvent != CollaborationEvent.TAB_REMOVED) continue;
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupLabeller.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupLabeller.java index 5419f21..9202b42 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupLabeller.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupLabeller.java
@@ -19,7 +19,6 @@ import org.chromium.components.collaboration.messaging.PersistentNotificationType; import java.util.List; -import java.util.Optional; /** Pushes label updates to UI for tab groups. */ @NullMarked @@ -50,8 +49,7 @@ @Override protected List<PersistentMessage> getAllMessages() { - return mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.DIRTY_TAB_GROUP)); + return mMessagingBackendService.getMessages(PersistentNotificationType.DIRTY_TAB_GROUP); } @Override
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupLabellerUnitTest.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupLabellerUnitTest.java index 25c16df..6802bc19 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupLabellerUnitTest.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupLabellerUnitTest.java
@@ -8,6 +8,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -117,7 +118,7 @@ @Test public void testShowAll_Added() { List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); mTabGroupLabeller.showAll(); @@ -129,7 +130,7 @@ public void testShowAll_WrongTabModel() { when(mTabGroupModelFilter.getGroupLastShownTabId(any())).thenReturn(Tab.INVALID_TAB_ID); List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); mTabGroupLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -140,7 +141,7 @@ PersistentMessage message = makeStandardMessage(); message.attribution.tabGroupMetadata.localTabGroupId = null; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); mTabGroupLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -151,7 +152,7 @@ PersistentMessage message = makeStandardMessage(); message.type = PersistentNotificationType.DIRTY_TAB; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); mTabGroupLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -161,7 +162,7 @@ public void testShowAll_OffTheRecord() { when(mTabModel.isOffTheRecord()).thenReturn(true); List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); mTabGroupLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -171,7 +172,7 @@ public void testShowAll_NullFilter() { mTabGroupModelFilterSupplier.set(null); List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); mTabGroupLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -200,7 +201,7 @@ @Test public void testOnMessagingBackendServiceInitialized() { List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); verify(mMessagingBackendService) .addPersistentMessageObserver(mPersistentMessageObserverCaptor.capture());
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupListMediatorUnitTest.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupListMediatorUnitTest.java index 6d69f408..f2ec6079 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupListMediatorUnitTest.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupListMediatorUnitTest.java
@@ -100,7 +100,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.Set; /** Tests for {@link TabGroupListMediator}. */ @@ -745,7 +744,7 @@ @EnableFeatures(ChromeFeatureList.DATA_SHARING) public void testNoTabGroupRemovedMessageCard() { List<PersistentMessage> messageList = List.of(); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); createMediator(); assertEquals(0, mModelList.size()); } @@ -755,7 +754,7 @@ public void testNoGroupRemovedMessageCard_NullId() { PersistentMessage messageWithoutId = new PersistentMessage(); messageWithoutId.attribution = new MessageAttribution(); - when(mMessagingBackendService.getMessages(any())).thenReturn(List.of(messageWithoutId)); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(List.of(messageWithoutId)); createMediator(); @@ -767,7 +766,7 @@ public void testTabGroupRemovedMessageCard() { List<PersistentMessage> messageList = List.of(makeTabGroupRemovedMessage(MESSAGE_ID1, GROUP_NAME1)); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); createMediator(); @@ -785,7 +784,7 @@ List.of( makeTabGroupRemovedMessage(MESSAGE_ID1, GROUP_NAME1), makeTabGroupRemovedMessage(MESSAGE_ID2, "")); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); createMediator(); @@ -804,7 +803,7 @@ makeTabGroupRemovedMessage(MESSAGE_ID1, GROUP_NAME1), makeTabGroupRemovedMessage(MESSAGE_ID2, GROUP_NAME2), makeTabGroupRemovedMessage(MESSAGE_ID3, GROUP_NAME3)); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); createMediator(); @@ -819,7 +818,7 @@ @EnableFeatures(ChromeFeatureList.DATA_SHARING) public void testTabGroupRemovedMessageCardWithOneUnnamedGroupTitle() { List<PersistentMessage> messageList = List.of(makeTabGroupRemovedMessage(MESSAGE_ID1, "")); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); createMediator(); @@ -837,8 +836,7 @@ List.of( makeTabGroupRemovedMessage(MESSAGE_ID1, GROUP_NAME1), makeTabGroupRemovedMessage(MESSAGE_ID2, GROUP_NAME2)); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); - + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); SavedTabGroup fooGroup = mSyncedGroupTestHelper.newTabGroup(SYNC_GROUP_ID1); fooGroup.title = "Foo"; fooGroup.color = TabGroupColorId.BLUE; @@ -890,7 +888,7 @@ List.of( makeTabGroupRemovedMessage(MESSAGE_ID1, GROUP_NAME1), makeTabGroupRemovedMessage(MESSAGE_ID2, GROUP_NAME2)); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); SavedTabGroup fooGroup = mSyncedGroupTestHelper.newTabGroup(SYNC_GROUP_ID1); fooGroup.title = "Foo"; @@ -940,7 +938,7 @@ List.of( makeTabGroupRemovedMessage(MESSAGE_ID1, GROUP_NAME1), makeTabGroupRemovedMessage(MESSAGE_ID2, GROUP_NAME2)); - when(mMessagingBackendService.getMessages(any())).thenReturn(messageList); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(messageList); SavedTabGroup fooGroup = mSyncedGroupTestHelper.newTabGroup(SYNC_GROUP_ID1); fooGroup.title = "Foo"; @@ -967,11 +965,9 @@ assertEquals(2, mModelList.size()); verify(mMessagingBackendService) - .clearPersistentMessage( - MESSAGE_ID1, Optional.of(PersistentNotificationType.TOMBSTONED)); + .clearPersistentMessage(MESSAGE_ID1, PersistentNotificationType.TOMBSTONED); verify(mMessagingBackendService) - .clearPersistentMessage( - MESSAGE_ID2, Optional.of(PersistentNotificationType.TOMBSTONED)); + .clearPersistentMessage(MESSAGE_ID2, PersistentNotificationType.TOMBSTONED); PropertyModel barModel = mModelList.get(0).model; assertEquals( @@ -994,13 +990,13 @@ PersistentMessage newMessageCard = makeTabGroupRemovedMessage(MESSAGE_ID2, GROUP_NAME2); // Set up backend to return the initial message. - when(mMessagingBackendService.getMessages(any())).thenReturn(List.of(originalMessage)); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(List.of(originalMessage)); createMediator(); assertEquals(1, mModelList.size()); // Invoke displayPersistentMessage from backend which adds one more message. - when(mMessagingBackendService.getMessages(any())) + when(mMessagingBackendService.getMessages(anyInt())) .thenReturn(List.of(originalMessage, newMessageCard)); verify(mMessagingBackendService) .addPersistentMessageObserver(mPersistentMessageObserverCaptor.capture()); @@ -1011,7 +1007,7 @@ // Disable sync which should clear all the backend messages. when(mSyncService.getActiveDataTypes()).thenReturn(Set.of()); - when(mMessagingBackendService.getMessages(any())).thenReturn(List.of()); + when(mMessagingBackendService.getMessages(anyInt())).thenReturn(List.of()); mSyncStateChangedListenerCaptor.getValue().syncStateChanged(); assertEquals(0, mModelList.size()); }
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupRemovedMessageMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupRemovedMessageMediator.java index 3004fd29..b4a0c691 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupRemovedMessageMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupRemovedMessageMediator.java
@@ -40,7 +40,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Optional; /** A mediator for the tab group removed message card for use in {@link TabGroupListCoordinator}. */ @NullMarked @@ -156,7 +155,7 @@ @Nullable String messageId = message.attribution.id; assert messageId != null && !TextUtils.isEmpty(messageId); mMessagingBackendService.clearPersistentMessage( - messageId, Optional.of(PersistentNotificationType.TOMBSTONED)); + messageId, PersistentNotificationType.TOMBSTONED); } removeMessageCard(); } @@ -180,8 +179,7 @@ private List<PersistentMessage> getTabGroupRemovedMessageList() { List<PersistentMessage> tabGroupRemovedMessages = new ArrayList<>(); List<PersistentMessage> messages = - mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED)); + mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED); for (PersistentMessage message : messages) { if (message.collaborationEvent != CollaborationEvent.TAB_GROUP_REMOVED
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupRemovedMessageMediatorUnitTest.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupRemovedMessageMediatorUnitTest.java index 19bebe0c..6689eb8 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupRemovedMessageMediatorUnitTest.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupRemovedMessageMediatorUnitTest.java
@@ -44,7 +44,6 @@ import java.util.Collections; import java.util.List; -import java.util.Optional; /** Unit tests for {@link TabGroupRemovedMessageMediator}. */ @RunWith(BaseRobolectricTestRunner.class) @@ -69,8 +68,7 @@ @Test public void testQueueMessageIfNeeded_noMessages() { - when(mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED))) + when(mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED)) .thenReturn(Collections.emptyList()); mMediator.queueMessageIfNeeded(); @@ -85,8 +83,7 @@ PersistentMessage invalidIdMessage = createMessage(null, "title2", CollaborationEvent.TAB_GROUP_REMOVED); - when(mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED))) + when(mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED)) .thenReturn(List.of(wrongTypeMessage, invalidIdMessage)); mMediator.queueMessageIfNeeded(); @@ -99,8 +96,7 @@ String title = "My Awesome Group"; PersistentMessage message1 = createMessage("id1", title, CollaborationEvent.TAB_GROUP_REMOVED); - when(mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED))) + when(mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED)) .thenReturn(List.of(message1)); mMediator.queueMessageIfNeeded(); @@ -124,8 +120,7 @@ createMessage("id1", title1, CollaborationEvent.TAB_GROUP_REMOVED); PersistentMessage message2 = createMessage("id2", title2, CollaborationEvent.TAB_GROUP_REMOVED); - when(mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED))) + when(mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED)) .thenReturn(List.of(message1, message2)); mMediator.queueMessageIfNeeded(); @@ -148,8 +143,7 @@ PersistentMessage message3 = createMessage("id3", "t3", CollaborationEvent.TAB_GROUP_REMOVED); - when(mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED))) + when(mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED)) .thenReturn(List.of(message1, message2, message3)); mMediator.queueMessageIfNeeded(); @@ -172,8 +166,7 @@ PersistentMessage message1 = createMessage("id1", title1, CollaborationEvent.TAB_GROUP_REMOVED); PersistentMessage message2 = createMessage("id2", "", CollaborationEvent.TAB_GROUP_REMOVED); - when(mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED))) + when(mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED)) .thenReturn(List.of(message1, message2)); mMediator.queueMessageIfNeeded(); @@ -198,8 +191,7 @@ createMessage(id1, "title1", CollaborationEvent.TAB_GROUP_REMOVED); PersistentMessage message2 = createMessage(id2, "title2", CollaborationEvent.TAB_GROUP_REMOVED); - when(mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.TOMBSTONED))) + when(mMessagingBackendService.getMessages(PersistentNotificationType.TOMBSTONED)) .thenReturn(List.of(message1, message2)); mMediator.queueMessageIfNeeded(); @@ -213,11 +205,9 @@ assertTrue(mModelList.isEmpty()); verify(mMessagingBackendService, times(1)) - .clearPersistentMessage( - eq(id1), eq(Optional.of(PersistentNotificationType.TOMBSTONED))); + .clearPersistentMessage(eq(id1), eq(PersistentNotificationType.TOMBSTONED)); verify(mMessagingBackendService, times(1)) - .clearPersistentMessage( - eq(id2), eq(Optional.of(PersistentNotificationType.TOMBSTONED))); + .clearPersistentMessage(eq(id2), eq(PersistentNotificationType.TOMBSTONED)); } @Test
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabLabeller.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabLabeller.java index 2fb60f1c..b5e9c783 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabLabeller.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabLabeller.java
@@ -35,7 +35,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.Optional; /** Pushes label updates to UI for tabs. */ @NullMarked @@ -84,8 +83,8 @@ if (tabGroupId == null) return Collections.emptyList(); LocalTabGroupId localTabGroupId = new LocalTabGroupId(tabGroupId); EitherGroupId eitherGroupId = EitherGroupId.createLocalId(localTabGroupId); - Optional<Integer> messageType = Optional.of(PersistentNotificationType.DIRTY_TAB); - return mMessagingBackendService.getMessagesForGroup(eitherGroupId, messageType); + return mMessagingBackendService.getMessagesForGroup( + eitherGroupId, PersistentNotificationType.DIRTY_TAB); } @Override
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabLabellerUnitTest.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabLabellerUnitTest.java index 05a0a88..5880e2e3 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabLabellerUnitTest.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabLabellerUnitTest.java
@@ -8,6 +8,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.notNull; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -136,7 +137,7 @@ @Test public void testShowAll_Added() { List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); @@ -150,7 +151,7 @@ PersistentMessage message2 = makeStandardMessage(); message2.attribution.tabMetadata.localTabId = TAB_ID2; List<PersistentMessage> messageList = List.of(message1, message2); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); @@ -164,7 +165,7 @@ PersistentMessage message = makeStandardMessage(); message.attribution.tabGroupMetadata.localTabGroupId = new LocalTabGroupId(GROUP_ID2); List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -175,7 +176,7 @@ PersistentMessage message = makeStandardMessage(); message.attribution.tabGroupMetadata.localTabGroupId = null; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -185,7 +186,7 @@ public void testShowAll_NullCurrentTabGroup() { mTabGroupIdSupplier.set(null); List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -196,7 +197,7 @@ PersistentMessage message = makeStandardMessage(); message.type = PersistentNotificationType.CHIP; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -207,7 +208,7 @@ PersistentMessage message = makeStandardMessage(); message.attribution.tabMetadata.localTabId = Tab.INVALID_TAB_ID; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -218,7 +219,7 @@ PersistentMessage message = makeStandardMessage(); message.collaborationEvent = CollaborationEvent.COLLABORATION_REMOVED; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); verify(mTabListNotificationHandler, never()).updateTabCardLabels(any()); @@ -229,7 +230,7 @@ PersistentMessage message = makeStandardMessage(); message.collaborationEvent = CollaborationEvent.TAB_UPDATED; List<PersistentMessage> messageList = List.of(message); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); mTabLabeller.showAll(); @@ -260,7 +261,7 @@ @Test public void testOnMessagingBackendServiceInitialized() { List<PersistentMessage> messageList = List.of(makeStandardMessage()); - when(mMessagingBackendService.getMessagesForGroup(any(), any())).thenReturn(messageList); + when(mMessagingBackendService.getMessagesForGroup(any(), anyInt())).thenReturn(messageList); verify(mMessagingBackendService) .addPersistentMessageObserver(mPersistentMessageObserverCaptor.capture());
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabModelNotificationDotManager.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabModelNotificationDotManager.java index 5cea0e1..f847a00 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabModelNotificationDotManager.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabModelNotificationDotManager.java
@@ -38,7 +38,6 @@ import org.chromium.components.collaboration.messaging.PersistentNotificationType; import java.util.List; -import java.util.Optional; /** Pushes whether a notification dot should be shown for a tab model. */ @NullMarked @@ -210,13 +209,12 @@ TabModel tabModel = mTabGroupModelFilter.getTabModel(); List<PersistentMessage> messages = - mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.DIRTY_TAB)); + mMessagingBackendService.getMessages(PersistentNotificationType.DIRTY_TAB); for (PersistentMessage message : messages) { int tabId = MessageUtils.extractTabId(message); if (tabId == Tab.INVALID_TAB_ID) continue; - @Nullable Tab tab = tabModel.getTabById(tabId); + Tab tab = tabModel.getTabById(tabId); if (tab != null && !tab.isClosing()) { String title = TabGroupTitleUtils.getDisplayableTitle(
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabModelNotificationDotManagerUnitTest.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabModelNotificationDotManagerUnitTest.java index 03be725..c6291c2 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabModelNotificationDotManagerUnitTest.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabModelNotificationDotManagerUnitTest.java
@@ -55,7 +55,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Optional; /** Unit tests for {@link TabModelNotificationDotManager}. */ @RunWith(BaseRobolectricTestRunner.class) @@ -317,8 +316,7 @@ messages.add(message); } - when(mMessagingBackendService.getMessages( - Optional.of(PersistentNotificationType.DIRTY_TAB))) + when(mMessagingBackendService.getMessages(PersistentNotificationType.DIRTY_TAB)) .thenReturn(messages); }
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java index 64667481..a2eacee 100644 --- a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java +++ b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java
@@ -155,7 +155,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Optional; import java.util.function.Supplier; /** Tests for {@link TabGridDialogMediator}. */ @@ -2162,15 +2161,14 @@ messageList.add(makePersistentMessage(CollaborationEvent.TAB_UPDATED)); } when(mMessagingBackendService.getMessagesForGroup( - any(), eq(Optional.of(PersistentNotificationType.DIRTY_TAB)))) + any(), eq(PersistentNotificationType.DIRTY_TAB))) .thenReturn(messageList); List<PersistentMessage> tombstonedMessageList = new ArrayList<>(); for (int i = 0; i < removed; i++) { tombstonedMessageList.add(makePersistentMessage(CollaborationEvent.TAB_REMOVED)); } - when(mMessagingBackendService.getMessages( - eq(Optional.of(PersistentNotificationType.TOMBSTONED)))) + when(mMessagingBackendService.getMessages(eq(PersistentNotificationType.TOMBSTONED))) .thenReturn(tombstonedMessageList); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java index a763a90..ed8acc1 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
@@ -60,6 +60,7 @@ import org.chromium.chrome.browser.night_mode.NightModeStateProvider; import org.chromium.chrome.browser.night_mode.NightModeUtils; import org.chromium.chrome.browser.ntp_customization.NtpCustomizationUtils; +import org.chromium.chrome.browser.ntp_customization.theme.NtpThemeStateProvider; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeFieldTrialImpl; @@ -139,6 +140,7 @@ private @Nullable EdgeToEdgeManager mEdgeToEdgeManager; private @Nullable EdgeToEdgeLayoutCoordinator mEdgeToEdgeLayoutCoordinator; private @Nullable EdgeToEdgeControllerCreator mEdgeToEdgeControllerCreator; + private NtpThemeStateProvider.@Nullable Observer mNtpThemeStateObserver; @Override protected void attachBaseContext(Context newBase) { @@ -232,6 +234,11 @@ R.anim.shared_x_axis_close_exit, SemanticColorUtils.getDefaultBgColor(this)); } + + if (ChromeFeatureList.sNewTabPageCustomizationV2.isEnabled()) { + mNtpThemeStateObserver = () -> recreate(); + NtpThemeStateProvider.getInstance().addObserver(mNtpThemeStateObserver); + } } /** @@ -313,6 +320,10 @@ mEdgeToEdgeControllerCreator.destroy(); mEdgeToEdgeControllerCreator = null; } + if (mNtpThemeStateObserver != null) { + NtpThemeStateProvider.getInstance().removeObserver(mNtpThemeStateObserver); + mNtpThemeStateObserver = null; + } super.onDestroy(); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutTab.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutTab.java index 854e867..b50a77b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutTab.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutTab.java
@@ -45,7 +45,6 @@ import org.chromium.ui.util.MotionEventUtils; import java.util.List; -import java.util.Optional; /** * {@link StripLayoutTab} is used to keep track of the strip position and rendering information for @@ -159,7 +158,7 @@ private float mContainerOpacity; // For avoiding unnecessary accessibility description updates. - private Optional<String> mCachedA11yDescriptionTitle = Optional.empty(); + private @Nullable String mCachedA11yDescriptionTitle; private @StringRes int mCachedA11yTabstripIdentifierResId; // Startup parameters @@ -367,7 +366,7 @@ // Cache the title + resource ID used to create this description so we can avoid unnecessary // updates. - mCachedA11yDescriptionTitle = Optional.ofNullable(title); + mCachedA11yDescriptionTitle = title; mCachedA11yTabstripIdentifierResId = newA11yTabstripIdentifierResId; } @@ -383,11 +382,11 @@ // A different resource ID was used to create the description. return true; } - if (mCachedA11yDescriptionTitle.isPresent() && newTitle == null) { + if (mCachedA11yDescriptionTitle != null && newTitle == null) { // Going from non-null title to null title. return true; } - if (newTitle != null && !newTitle.equals(mCachedA11yDescriptionTitle.orElse(null))) { + if (newTitle != null && !newTitle.equals(mCachedA11yDescriptionTitle)) { // Going from non-null title to some other title (may even be null). return true; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java index 5b93ab3..ee59ca0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java
@@ -18,8 +18,6 @@ import org.chromium.net.NetError; import org.chromium.url.GURL; -import java.util.Optional; - /** An observer for firing navigation events on {@link CustomTabsCallback}. */ @NullMarked public class CustomTabNavigationEventObserver extends EmptyTabObserver { @@ -78,14 +76,14 @@ // For privacy reason, we do not pass all the error codes but choose a few safe ones. // See crbug/1501085 for more details. - Optional<Integer> code = + Integer code = switch (errorCode) { case NetError.ERR_INTERNET_DISCONNECTED: case NetError.ERR_CONNECTION_TIMED_OUT: case NetError.ERR_NAME_RESOLUTION_FAILED: - yield Optional.of(getReportErrorCode(errorCode)); + yield getReportErrorCode(errorCode); default: - yield Optional.empty(); + yield null; }; mConnection.notifyNavigationEvent(mSessionToken, navigationEvent, code);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java index ad35f9a..68e8111 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
@@ -104,7 +104,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; @@ -1597,10 +1596,10 @@ } /** - * @see {@link notifyNavigationEvent(SessionHolder, int, Optional<int>)} + * @see {@link notifyNavigationEvent(SessionHolder, int, int)} */ public boolean notifyNavigationEvent(@Nullable SessionHolder<?> session, int navigationEvent) { - return notifyNavigationEvent(session, navigationEvent, Optional.empty()); + return notifyNavigationEvent(session, navigationEvent, /* errorCode= */ null); } /** @@ -1610,17 +1609,17 @@ * * @param session The Binder object identifying the session. * @param navigationEvent The navigation event code, defined in {@link CustomTabsCallback} - * @param errorCode Network error code. Empty if there was no error or the error code is not in + * @param errorCode Network error code. Null if there was no error or the error code is not in * the list of error codes that should be passed to the embedder. * @return true for success. */ public boolean notifyNavigationEvent( - @Nullable SessionHolder<?> session, int navigationEvent, Optional<Integer> errorCode) { + @Nullable SessionHolder<?> session, int navigationEvent, @Nullable Integer errorCode) { BrowserCallbackWrapper callback = mClientManager.getCallbackForSession(session); if (callback == null) return false; try { Bundle extra = getExtrasBundleForNavigationEventForSession(session); - if (errorCode.isPresent()) extra.putInt("navigationEventErrorCode", errorCode.get()); + if (errorCode != null) extra.putInt("navigationEventErrorCode", errorCode); callback.onNavigationEvent(navigationEvent, extra); } catch (Exception e) { // Catching all exceptions is really bad, but we need it here,
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserverUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserverUnitTest.java index cd069ab0..f0a0be2f 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserverUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserverUnitTest.java
@@ -29,8 +29,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.net.NetError; -import java.util.Optional; - /** Tests for some parts of {@link CustomTabsConnection}. */ @RunWith(BaseRobolectricTestRunner.class) @Batch(Batch.UNIT_TESTS) @@ -73,8 +71,7 @@ histogramWatcher = buildHistogramWatcher(err); observer.onPageLoadFailed(null, err); verify(mConnection) - .notifyNavigationEvent( - any(), eq(CustomTabsCallback.NAVIGATION_FAILED), eq(Optional.empty())); + .notifyNavigationEvent(any(), eq(CustomTabsCallback.NAVIGATION_FAILED), eq(null)); histogramWatcher.assertExpected(); } @@ -114,8 +111,6 @@ int reportError = CustomTabNavigationEventObserver.getReportErrorCode(err); verify(mConnection) .notifyNavigationEvent( - any(), - eq(CustomTabsCallback.NAVIGATION_FAILED), - eq(Optional.of(reportError))); + any(), eq(CustomTabsCallback.NAVIGATION_FAILED), eq(reportError)); } }
diff --git a/chrome/browser/ash/app_list/DEPS b/chrome/browser/ash/app_list/DEPS index f9fdca14..d4e860ff 100644 --- a/chrome/browser/ash/app_list/DEPS +++ b/chrome/browser/ash/app_list/DEPS
@@ -36,7 +36,6 @@ "+chrome/browser/extensions/extension_ui_util.h", "+chrome/browser/extensions/extension_util.h", "+chrome/browser/extensions/install_tracker_factory.h", - "+chrome/browser/extensions/install_tracker.h", "+chrome/browser/extensions/launch_util.h", "+chrome/browser/extensions/menu_manager_factory.h", "+chrome/browser/extensions/menu_manager.h",
diff --git a/chrome/browser/ash/app_list/app_service/DEPS b/chrome/browser/ash/app_list/app_service/DEPS index 1835f36..1b1c76b 100644 --- a/chrome/browser/ash/app_list/app_service/DEPS +++ b/chrome/browser/ash/app_list/app_service/DEPS
@@ -28,7 +28,6 @@ "+chrome/browser/extensions/chrome_app_icon.h", "+chrome/browser/extensions/context_menu_matcher.h", "+chrome/browser/extensions/install_tracker_factory.h", - "+chrome/browser/extensions/install_tracker.h", "+chrome/browser/extensions/menu_manager.h", "+chrome/browser/profiles", "+chrome/browser/ui/ash/shelf",
diff --git a/chrome/browser/ash/app_list/app_service/app_service_app_model_builder_unittest.cc b/chrome/browser/ash/app_list/app_service/app_service_app_model_builder_unittest.cc index 6134494..c32db18 100644 --- a/chrome/browser/ash/app_list/app_service/app_service_app_model_builder_unittest.cc +++ b/chrome/browser/ash/app_list/app_service/app_service_app_model_builder_unittest.cc
@@ -41,7 +41,6 @@ #include "chrome/browser/ash/plugin_vm/plugin_vm_features.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_test_helper.h" #include "chrome/browser/extensions/chrome_app_icon.h" -#include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h" @@ -79,6 +78,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/image_loader.h" +#include "extensions/browser/install_tracker.h" #include "extensions/browser/uninstall_reason.h" #include "extensions/common/extension_set.h" #include "extensions/common/manifest.h"
diff --git a/chrome/browser/ash/app_mode/DEPS b/chrome/browser/ash/app_mode/DEPS index b16d18f..3541f65b 100644 --- a/chrome/browser/ash/app_mode/DEPS +++ b/chrome/browser/ash/app_mode/DEPS
@@ -36,7 +36,7 @@ "+chrome/browser/extensions/extension_special_storage_policy.h", "+chrome/browser/extensions/external_loader.h", "+chrome/browser/extensions/external_provider_impl.h", - "+chrome/browser/extensions/install_tracker.h", + "+chrome/browser/extensions/install_tracker_factory.h", "+chrome/browser/extensions/updater/extension_updater.h", "+chrome/browser/extensions/updater/extension_updater_factory.h", "+chrome/browser/extensions/webstore_data_fetcher_delegate.h",
diff --git a/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc b/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc index cdcdadc..ad37f47 100644 --- a/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc +++ b/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc
@@ -42,7 +42,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/apps/chrome_app_delegate.h" #include "chrome/common/chrome_switches.h" @@ -64,6 +64,7 @@ #include "extensions/browser/external_install_info.h" #include "extensions/browser/external_provider_interface.h" #include "extensions/browser/install_flag.h" +#include "extensions/browser/install_tracker.h" #include "extensions/browser/pending_extension_manager.h" #include "extensions/browser/test_event_router.h" #include "extensions/browser/uninstall_reason.h" @@ -250,7 +251,7 @@ extension_registrar_->OnExtensionInstalled( extension, syncer::StringOrdinal::CreateInitialOrdinal(), extensions::kInstallFlagInstallImmediately); - extensions::InstallTracker::Get(browser_context_) + extensions::InstallTrackerFactory::GetForBrowserContext(browser_context_) ->OnFinishCrxInstall(base::FilePath(), extension->id(), extension, true); return true; @@ -270,7 +271,7 @@ pending_crx_files_.erase(extension_id); pending_update_urls_.erase(extension_id); - extensions::InstallTracker::Get(browser_context_) + extensions::InstallTrackerFactory::GetForBrowserContext(browser_context_) ->OnFinishCrxInstall(base::FilePath(), extension_id, nullptr, false); pending_extension_manager->Remove(extension_id); return true; @@ -295,7 +296,7 @@ } pending_crx_files_.insert(info.extension_id); - extensions::InstallTracker::Get(browser_context_) + extensions::InstallTrackerFactory::GetForBrowserContext(browser_context_) ->OnBeginCrxInstall(info.extension_id); return true; } @@ -316,7 +317,7 @@ } pending_update_urls_.insert(info.extension_id); - extensions::InstallTracker::Get(browser_context_) + extensions::InstallTrackerFactory::GetForBrowserContext(browser_context_) ->OnBeginCrxInstall(info.extension_id); return true; }
diff --git a/chrome/browser/ash/extensions/DEPS b/chrome/browser/ash/extensions/DEPS index 8e25a1db..8e3c7af 100644 --- a/chrome/browser/ash/extensions/DEPS +++ b/chrome/browser/ash/extensions/DEPS
@@ -45,8 +45,7 @@ "+chrome/browser/extensions/extension_util.h", "+chrome/browser/extensions/external_loader.h", "+chrome/browser/extensions/external_provider_impl.h", - "+chrome/browser/extensions/install_observer.h", - "+chrome/browser/extensions/install_tracker.h", + "+chrome/browser/extensions/install_tracker_factory.h", "+chrome/browser/extensions/mock_crx_installer.h", "+chrome/browser/extensions/updater", "+chrome/browser/lifetime",
diff --git a/chrome/browser/ash/extensions/external_cache_impl.cc b/chrome/browser/ash/extensions/external_cache_impl.cc index bfd29c14..5e50e2b3 100644 --- a/chrome/browser/ash/extensions/external_cache_impl.cc +++ b/chrome/browser/ash/extensions/external_cache_impl.cc
@@ -25,8 +25,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/browser/extensions/install_observer.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/updater/chrome_extension_downloader_factory.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager_observer.h" @@ -34,6 +33,8 @@ #include "chromeos/ash/components/settings/cros_settings_names.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/install_observer.h" +#include "extensions/browser/install_tracker.h" #include "extensions/browser/updater/extension_downloader.h" #include "extensions/browser/updater/extension_downloader_delegate.h" #include "extensions/browser/updater/extension_downloader_types.h" @@ -126,7 +127,8 @@ observed_profiles_.insert(profile); } - auto* tracker = extensions::InstallTracker::Get(profile); + auto* tracker = + extensions::InstallTrackerFactory::GetForBrowserContext(profile); // Only observe the tracker if it's not already observed - it could be shared // between profiles (for example regular & incognito). It's also legal for the // tracker not to exist - some profiles (like the CrOS system profile) don't @@ -138,7 +140,8 @@ void ExternalCacheImpl::AnyInstallFailureObserver::OnProfileWillBeDestroyed( Profile* profile) { - auto* tracker = extensions::InstallTracker::Get(profile); + auto* tracker = + extensions::InstallTrackerFactory::GetForBrowserContext(profile); // If we received this notification for a given profile, we must have been // observing it to receive the notification in the first place. @@ -173,11 +176,12 @@ bool ExternalCacheImpl::AnyInstallFailureObserver:: IsAnyObservedProfileUsingTracker( extensions::InstallTracker* tracker) const { - return std::find_if(observed_profiles_.begin(), observed_profiles_.end(), - [=](Profile* profile) -> bool { - return extensions::InstallTracker::Get(profile) == - tracker; - }) != observed_profiles_.end(); + return std::find_if( + observed_profiles_.begin(), observed_profiles_.end(), + [=](Profile* profile) -> bool { + return extensions::InstallTrackerFactory::GetForBrowserContext( + profile) == tracker; + }) != observed_profiles_.end(); } ExternalCacheImpl::ExternalCacheImpl(
diff --git a/chrome/browser/ash/policy/login/DEPS b/chrome/browser/ash/policy/login/DEPS index 68638e7..5d69aaa 100644 --- a/chrome/browser/ash/policy/login/DEPS +++ b/chrome/browser/ash/policy/login/DEPS
@@ -21,8 +21,7 @@ "+chrome/browser/ash/profiles", "+chrome/browser/browser_process.h", "+chrome/browser/extensions/crx_installer.h", - "+chrome/browser/extensions/install_observer.h", - "+chrome/browser/extensions/install_tracker.h", + "+chrome/browser/extensions/install_tracker_factory.h", "+chrome/browser/extensions/policy_test_utils.h", "+chrome/browser/extensions/updater/extension_updater.h", "+chrome/browser/lifetime",
diff --git a/chrome/browser/ash/policy/login/signin_profile_extensions_policy_browsertest.cc b/chrome/browser/ash/policy/login/signin_profile_extensions_policy_browsertest.cc index 38e6b06..154931d 100644 --- a/chrome/browser/ash/policy/login/signin_profile_extensions_policy_browsertest.cc +++ b/chrome/browser/ash/policy/login/signin_profile_extensions_policy_browsertest.cc
@@ -19,8 +19,7 @@ #include "base/version.h" #include "chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.h" #include "chrome/browser/extensions/crx_installer.h" -#include "chrome/browser/extensions/install_observer.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/policy/extension_force_install_mixin.h" #include "chrome/browser/profiles/profile.h" @@ -33,6 +32,8 @@ #include "extensions/browser/extension_registrar.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_util.h" +#include "extensions/browser/install_observer.h" +#include "extensions/browser/install_tracker.h" #include "extensions/browser/test_extension_registry_observer.h" #include "extensions/browser/update_observer.h" #include "extensions/common/extension.h" @@ -103,7 +104,8 @@ ExtensionInstallErrorObserver(Profile* profile, const std::string& extension_id) : extension_id_(extension_id) { - auto* tracker = extensions::InstallTracker::Get(profile); + auto* tracker = + extensions::InstallTrackerFactory::GetForBrowserContext(profile); CHECK(tracker); observation_.Observe(tracker); }
diff --git a/chrome/browser/ash/video_conference/BUILD.gn b/chrome/browser/ash/video_conference/BUILD.gn index d297b31..bcb65cb 100644 --- a/chrome/browser/ash/video_conference/BUILD.gn +++ b/chrome/browser/ash/video_conference/BUILD.gn
@@ -12,6 +12,8 @@ "video_conference_app_service_client.h", "video_conference_ash_feature_client.cc", "video_conference_ash_feature_client.h", + "video_conference_client_base.cc", + "video_conference_client_base.h", "video_conference_client_wrapper.cc", "video_conference_client_wrapper.h", "video_conference_manager_ash.cc",
diff --git a/chrome/browser/ash/video_conference/video_conference_app_service_client.cc b/chrome/browser/ash/video_conference/video_conference_app_service_client.cc index 4e15820..f84c759 100644 --- a/chrome/browser/ash/video_conference/video_conference_app_service_client.cc +++ b/chrome/browser/ash/video_conference/video_conference_app_service_client.cc
@@ -32,22 +32,6 @@ VideoConferenceAppServiceClient* g_client_instance = nullptr; -crosapi::mojom::VideoConferenceAppType ToVideoConferenceAppType( - apps::AppType app_type) { - switch (app_type) { - case apps::AppType::kArc: - return crosapi::mojom::VideoConferenceAppType::kArcApp; - case apps::AppType::kChromeApp: - return crosapi::mojom::VideoConferenceAppType::kChromeApp; - case apps::AppType::kWeb: - return crosapi::mojom::VideoConferenceAppType::kWebApp; - case apps::AppType::kExtension: - return crosapi::mojom::VideoConferenceAppType::kChromeExtension; - default: - return crosapi::mojom::VideoConferenceAppType::kAppServiceUnknown; - } -} - bool IsPermissionAsked(const apps::PermissionPtr& permission) { return std::holds_alternative<apps::TriState>(permission->value) && std::get<apps::TriState>(permission->value) == apps::TriState::kAsk; @@ -57,18 +41,7 @@ VideoConferenceAppServiceClient::VideoConferenceAppServiceClient( VideoConferenceManagerAsh* video_conference_manager_ash) - : client_id_(base::UnguessableToken::Create()), - status_(crosapi::mojom::VideoConferenceMediaUsageStatus::New( - /*client_id=*/client_id_, - /*has_media_app=*/false, - /*has_camera_permission=*/false, - /*has_microphone_permission=*/false, - /*is_capturing_camera=*/false, - /*is_capturing_microphone=*/false, - /*is_capturing_screen=*/false)), - video_conference_manager_ash_(CHECK_DEREF(video_conference_manager_ash)) { - video_conference_manager_ash_->RegisterCppClient(this, client_id_); - + : VideoConferenceClientBase(video_conference_manager_ash) { session_observation_.Observe(Shell::Get()->session_controller()); // Initialize with current session state. @@ -78,38 +51,9 @@ } VideoConferenceAppServiceClient::~VideoConferenceAppServiceClient() { - // C++ clients are responsible for manually calling |UnregisterClient| on the - // manager when disconnecting. - video_conference_manager_ash_->UnregisterClient(client_id_); - g_client_instance = nullptr; } -void VideoConferenceAppServiceClient::GetMediaApps( - GetMediaAppsCallback callback) { - std::vector<crosapi::mojom::VideoConferenceMediaAppInfoPtr> apps; - - for (const auto& [app_id, app_state] : id_to_app_state_) { - const std::string app_name = GetAppName(app_id); - // app_name should not be empty. - if (app_name.empty()) { - continue; - } - - apps.push_back(crosapi::mojom::VideoConferenceMediaAppInfo::New( - /*id=*/app_state.token, - /*last_activity_time=*/app_state.last_activity_time, - /*is_capturing_camera=*/app_state.is_capturing_camera, - /*is_capturing_microphone=*/app_state.is_capturing_microphone, - /*is_capturing_screen=*/false, - /*title=*/base::UTF8ToUTF16(app_name), - /*url=*/std::nullopt, - /*app_type=*/ToVideoConferenceAppType(GetAppType(app_id)))); - } - - std::move(callback).Run(std::move(apps)); -} - void VideoConferenceAppServiceClient::ReturnToApp( const base::UnguessableToken& token, ReturnToAppCallback callback) { @@ -142,27 +86,6 @@ std::move(callback).Run(true); } -void VideoConferenceAppServiceClient::SetSystemMediaDeviceStatus( - crosapi::mojom::VideoConferenceMediaDevice device, - bool disabled, - SetSystemMediaDeviceStatusCallback callback) { - switch (device) { - case crosapi::mojom::VideoConferenceMediaDevice::kCamera: - camera_system_disabled_ = disabled; - std::move(callback).Run(true); - return; - case crosapi::mojom::VideoConferenceMediaDevice::kMicrophone: - microphone_system_disabled_ = disabled; - std::move(callback).Run(true); - return; - case crosapi::mojom::VideoConferenceMediaDevice::kUnusedDefault: - std::move(callback).Run(false); - return; - } -} - -void VideoConferenceAppServiceClient::StopAllScreenShare() {} - void VideoConferenceAppServiceClient::OnCapabilityAccessUpdate( const apps::CapabilityAccessUpdate& update) { const AppIdString& app_id = update.AppId(); @@ -401,36 +324,4 @@ } } -void VideoConferenceAppServiceClient::HandleMediaUsageUpdate() { - crosapi::mojom::VideoConferenceMediaUsageStatusPtr new_status = - crosapi::mojom::VideoConferenceMediaUsageStatus::New(); - new_status->client_id = client_id_; - new_status->has_media_app = !id_to_app_state_.empty(); - - for (const auto& [app_id, app_state] : id_to_app_state_) { - new_status->is_capturing_camera |= app_state.is_capturing_camera; - new_status->is_capturing_microphone |= app_state.is_capturing_microphone; - - VideoConferencePermissions permissions = GetAppPermission(app_id); - new_status->has_camera_permission |= permissions.has_camera_permission; - new_status->has_microphone_permission |= - permissions.has_microphone_permission; - } - - // If `status` equals the previously sent status, don't notify manager. - if (new_status.Equals(status_)) { - return; - } - status_ = new_status->Clone(); - - auto callback = base::BindOnce([](bool success) { - if (!success) { - LOG(ERROR) - << "VideoConferenceManager::NotifyMediaUsageUpdate did not succeed."; - } - }); - video_conference_manager_ash_->NotifyMediaUsageUpdate(std::move(new_status), - std::move(callback)); -} - } // namespace ash
diff --git a/chrome/browser/ash/video_conference/video_conference_app_service_client.h b/chrome/browser/ash/video_conference/video_conference_app_service_client.h index 9eb664f..efba300 100644 --- a/chrome/browser/ash/video_conference/video_conference_app_service_client.h +++ b/chrome/browser/ash/video_conference/video_conference_app_service_client.h
@@ -14,6 +14,7 @@ #include "base/scoped_observation.h" #include "base/time/time.h" #include "base/unguessable_token.h" +#include "chrome/browser/ash/video_conference/video_conference_client_base.h" #include "chrome/browser/chromeos/video_conference/video_conference_manager_client_common.h" #include "chromeos/crosapi/mojom/video_conference.mojom.h" #include "components/services/app_service/public/cpp/app_capability_access_cache.h" @@ -41,25 +42,11 @@ // videoconferencing. It detects the launching/closing/media-capturing actions // from apps through AppService and notifies VideoConferenceManagerAsh. class VideoConferenceAppServiceClient - : public crosapi::mojom::VideoConferenceManagerClient, + : public VideoConferenceClientBase, public apps::AppCapabilityAccessCache::Observer, public apps::InstanceRegistry::Observer, public SessionObserver { public: - using AppIdString = std::string; - using VideoConferencePermissions = - video_conference::VideoConferencePermissions; - - // AppState records information that is required for VideoConferenceManagerAsh - // to show correct icons. - struct AppState { - // Used for uniquely identifying an App in VideoConferenceManagerAsh. - base::UnguessableToken token; - base::Time last_activity_time; - bool is_capturing_microphone = false; - bool is_capturing_camera = false; - }; - // The passed `video_conference_manager_ash` must outlive this instance. explicit VideoConferenceAppServiceClient( VideoConferenceManagerAsh* video_conference_manager_ash); @@ -72,14 +59,8 @@ ~VideoConferenceAppServiceClient() override; // crosapi::mojom::VideoConferenceManagerClient overrides. - void GetMediaApps(GetMediaAppsCallback callback) override; void ReturnToApp(const base::UnguessableToken& token, ReturnToAppCallback callback) override; - void SetSystemMediaDeviceStatus( - crosapi::mojom::VideoConferenceMediaDevice device, - bool disabled, - SetSystemMediaDeviceStatusCallback callback) override; - void StopAllScreenShare() override; // apps::AppCapabilityAccessCache::Observer overrides. void OnCapabilityAccessUpdate( @@ -95,21 +76,19 @@ // SessionObserver overrides. void OnSessionStateChanged(session_manager::SessionState state) override; + protected: + // VideoConferenceClientBase overrides. + std::string GetAppName(const AppIdString& app_id) override; + VideoConferencePermissions GetAppPermission( + const AppIdString& app_id) override; + apps::AppType GetAppType(const AppIdString& app_id) override; + private: friend class VideoConferenceAppServiceClientTest; // Returns current VideoConferenceAppServiceClient for testing purpose. static VideoConferenceAppServiceClient* GetForTesting(); - // Returns the name of the app with `app_id`. - std::string GetAppName(const AppIdString& app_id); - - // Returns the current camera/microphone permission status for `app_id`. - VideoConferencePermissions GetAppPermission(const AppIdString& app_id); - - // Returns the AppType of `app_id`. - apps::AppType GetAppType(const AppIdString& app_id); - // Returns AppState of `app_id`; adds if doesn't exist yet. AppState& GetOrAddAppState(const AppIdString& app_id); @@ -117,33 +96,14 @@ // for it. void MaybeRemoveApp(const AppIdString& app_id); - // Calculates a new `crosapi::mojom::VideoConferenceMediaUsageStatus` from all - // current VC apps and notifies the manager if a field has changed. - void HandleMediaUsageUpdate(); - // These registries are used for observing app behaviors. raw_ptr<apps::InstanceRegistry> instance_registry_; raw_ptr<apps::AppRegistryCache> app_registry_; raw_ptr<apps::AppCapabilityAccessCache> capability_cache_; - // Unique id associated with this client. It is used by the VcManager to - // identify clients. - const base::UnguessableToken client_id_; - // Only used for testing purpose. raw_ptr<ukm::UkmRecorder> test_ukm_recorder_ = nullptr; - // Current status_ aggregated from all apps in `id_to_app_state_`. - crosapi::mojom::VideoConferenceMediaUsageStatusPtr status_; - - // The following two fields are true if the camera/microphone is system-wide - // software disabled OR disabled via a hardware switch. - bool camera_system_disabled_{false}; - bool microphone_system_disabled_{false}; - - // This records a list of AppState; each represents a video conference app. - std::map<AppIdString, AppState> id_to_app_state_; - std::map<AppIdString, std::unique_ptr<video_conference::VideoConferenceUkmHelper>> id_to_ukm_hepler_; @@ -159,8 +119,6 @@ apps::AppCapabilityAccessCache::Observer> app_capability_observation_{this}; - const raw_ref<VideoConferenceManagerAsh> video_conference_manager_ash_; - base::WeakPtrFactory<VideoConferenceAppServiceClient> weak_ptr_factory_{this}; };
diff --git a/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc b/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc index 0fa741d4..73a3dd5 100644 --- a/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc +++ b/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc
@@ -144,6 +144,10 @@ class VideoConferenceAppServiceClientTest : public InProcessBrowserTest { public: + using AppState = VideoConferenceAppServiceClient::AppState; + using VideoConferencePermissions = + VideoConferenceAppServiceClient::VideoConferencePermissions; + void SetUp() override { scoped_feature_list_.InitAndEnableFeature( ash::features::kFeatureManagementVideoConference); @@ -186,7 +190,7 @@ bool has_microphone_permission) { std::vector<apps::AppPtr> deltas; deltas.push_back(MakeApp(app_id, has_camera_permission, - has_microphone_permission, GetAppType(app_id))); + has_microphone_permission, apps::AppType::kArc)); app_service_proxy_->OnApps(std::move(deltas), apps::AppType::kUnknown, /*should_notify_initialized=*/false); } @@ -206,8 +210,7 @@ } // Adds {id, state} pair to client_->id_to_app_state_. - void AddAppState(const AppIdString& app_id, - const VideoConferenceAppServiceClient::AppState& state) { + void AddAppState(const AppIdString& app_id, const AppState& state) { (client_->id_to_app_state_)[app_id] = state; } @@ -276,8 +279,7 @@ IN_PROC_BROWSER_TEST_F(VideoConferenceAppServiceClientTest, GetAppPermission) { InstallApp(kAppId1); - VideoConferenceAppServiceClient::VideoConferencePermissions permission = - GetAppPermission(kAppId1); + VideoConferencePermissions permission = GetAppPermission(kAppId1); EXPECT_FALSE(permission.has_camera_permission); EXPECT_FALSE(permission.has_microphone_permission); @@ -309,14 +311,12 @@ IN_PROC_BROWSER_TEST_F(VideoConferenceAppServiceClientTest, GetMediaApps) { // Add {kAppId1, state1} pair to the client_. const base::UnguessableToken token1 = base::UnguessableToken::Create(); - const VideoConferenceAppServiceClient::AppState state1{ - token1, base::Time::Now(), true, true}; + const AppState state1{token1, base::Time::Now(), true, true}; AddAppState(kAppId1, state1); // Add {kAppId2, state2} pair to the client_. const base::UnguessableToken token2 = base::UnguessableToken::Create(); - const VideoConferenceAppServiceClient::AppState state2{ - token2, base::Time::Now(), true, false}; + const AppState state2{token2, base::Time::Now(), true, false}; AddAppState(kAppId2, state2); std::vector<crosapi::mojom::VideoConferenceMediaAppInfoPtr> media_app_info = @@ -373,8 +373,7 @@ EXPECT_FALSE(window2->IsVisible()); // Add pair {token1, state1} to client_->id_to_app_state_. - const VideoConferenceAppServiceClient::AppState state1{ - token1, base::Time::Now(), true, true}; + const AppState state1{token1, base::Time::Now(), true, true}; AddAppState(kAppId1, state1); // Return to token1 should show all instances associated with kAppId1.
diff --git a/chrome/browser/ash/video_conference/video_conference_ash_feature_client.cc b/chrome/browser/ash/video_conference/video_conference_ash_feature_client.cc index 653be64..873a437 100644 --- a/chrome/browser/ash/video_conference/video_conference_ash_feature_client.cc +++ b/chrome/browser/ash/video_conference/video_conference_ash_feature_client.cc
@@ -41,18 +41,7 @@ VideoConferenceAshFeatureClient::VideoConferenceAshFeatureClient( VideoConferenceManagerAsh* video_conference_manager_ash) - : client_id_(base::UnguessableToken::Create()), - status_(crosapi::mojom::VideoConferenceMediaUsageStatus::New( - /*client_id=*/client_id_, - /*has_media_app=*/false, - /*has_camera_permission=*/false, - /*has_microphone_permission=*/false, - /*is_capturing_camera=*/false, - /*is_capturing_microphone=*/false, - /*is_capturing_screen=*/false)), - video_conference_manager_ash_(CHECK_DEREF(video_conference_manager_ash)) { - video_conference_manager_ash_->RegisterCppClient(this, client_id_); - + : VideoConferenceClientBase(video_conference_manager_ash) { CHECK(!g_client_instance); g_client_instance = this; @@ -80,34 +69,9 @@ } VideoConferenceAshFeatureClient::~VideoConferenceAshFeatureClient() { - // C++ clients are responsible for manually calling |UnregisterClient| on the - // manager when disconnecting. - video_conference_manager_ash_->UnregisterClient(client_id_); - g_client_instance = nullptr; } -void VideoConferenceAshFeatureClient::GetMediaApps( - GetMediaAppsCallback callback) { - std::vector<crosapi::mojom::VideoConferenceMediaAppInfoPtr> apps; - - for (const auto& [app_id, app_state] : id_to_app_state_) { - const std::string app_name = GetAppName(app_id); - - apps.push_back(crosapi::mojom::VideoConferenceMediaAppInfo::New( - /*id=*/app_state.token, - /*last_activity_time=*/app_state.last_activity_time, - /*is_capturing_camera=*/app_state.is_capturing_camera, - /*is_capturing_microphone=*/app_state.is_capturing_microphone, - /*is_capturing_screen=*/false, - /*title=*/base::UTF8ToUTF16(app_name), - /*url=*/std::nullopt, - /*app_type=*/GetAppType(app_id))); - } - - std::move(callback).Run(std::move(apps)); -} - void VideoConferenceAshFeatureClient::ReturnToApp( const base::UnguessableToken& token, ReturnToAppCallback callback) { @@ -116,27 +80,6 @@ std::move(callback).Run(true); } -void VideoConferenceAshFeatureClient::SetSystemMediaDeviceStatus( - crosapi::mojom::VideoConferenceMediaDevice device, - bool disabled, - SetSystemMediaDeviceStatusCallback callback) { - switch (device) { - case crosapi::mojom::VideoConferenceMediaDevice::kCamera: - camera_system_disabled_ = disabled; - std::move(callback).Run(true); - return; - case crosapi::mojom::VideoConferenceMediaDevice::kMicrophone: - microphone_system_disabled_ = disabled; - std::move(callback).Run(true); - return; - case crosapi::mojom::VideoConferenceMediaDevice::kUnusedDefault: - std::move(callback).Run(false); - return; - } -} - -void VideoConferenceAshFeatureClient::StopAllScreenShare() {} - void VideoConferenceAshFeatureClient::OnVmDeviceUpdated( VmCameraMicManager::VmType vm_type, VmCameraMicManager::DeviceType device_type, @@ -217,21 +160,21 @@ return permissions; } -crosapi::mojom::VideoConferenceAppType -VideoConferenceAshFeatureClient::GetAppType(const AppIdString& app_id) { +apps::AppType VideoConferenceAshFeatureClient::GetAppType( + const AppIdString& app_id) { if (app_id == kCrostiniVmId) { - return crosapi::mojom::VideoConferenceAppType::kCrostiniVm; + return apps::AppType::kCrostini; } if (app_id == kPluginVmId) { - return crosapi::mojom::VideoConferenceAppType::kPluginVm; + return apps::AppType::kPluginVm; } if (app_id == kBorealisId) { - return crosapi::mojom::VideoConferenceAppType::kBorealis; + return apps::AppType::kBorealis; } - return crosapi::mojom::VideoConferenceAppType::kAshClientUnknown; + return apps::AppType::kUnknown; } VideoConferenceAshFeatureClient::AppState& @@ -251,36 +194,4 @@ } } -void VideoConferenceAshFeatureClient::HandleMediaUsageUpdate() { - crosapi::mojom::VideoConferenceMediaUsageStatusPtr new_status = - crosapi::mojom::VideoConferenceMediaUsageStatus::New(); - new_status->client_id = client_id_; - new_status->has_media_app = !id_to_app_state_.empty(); - - for (const auto& [app_id, app_state] : id_to_app_state_) { - new_status->is_capturing_camera |= app_state.is_capturing_camera; - new_status->is_capturing_microphone |= app_state.is_capturing_microphone; - - VideoConferencePermissions permissions = GetAppPermission(app_id); - new_status->has_camera_permission |= permissions.has_camera_permission; - new_status->has_microphone_permission |= - permissions.has_microphone_permission; - } - - // If `status` equals the previously sent status, don't notify manager. - if (new_status.Equals(status_)) { - return; - } - status_ = new_status->Clone(); - - auto callback = base::BindOnce([](bool success) { - if (!success) { - LOG(ERROR) - << "VideoConferenceManager::NotifyMediaUsageUpdate did not succeed."; - } - }); - video_conference_manager_ash_->NotifyMediaUsageUpdate(std::move(new_status), - std::move(callback)); -} - } // namespace ash
diff --git a/chrome/browser/ash/video_conference/video_conference_ash_feature_client.h b/chrome/browser/ash/video_conference/video_conference_ash_feature_client.h index e0ff962d..55de7f7f 100644 --- a/chrome/browser/ash/video_conference/video_conference_ash_feature_client.h +++ b/chrome/browser/ash/video_conference/video_conference_ash_feature_client.h
@@ -7,6 +7,7 @@ #include "base/unguessable_token.h" #include "chrome/browser/ash/camera_mic/vm_camera_mic_manager.h" +#include "chrome/browser/ash/video_conference/video_conference_client_base.h" #include "chrome/browser/chromeos/video_conference/video_conference_manager_client_common.h" #include "chromeos/crosapi/mojom/video_conference.mojom.h" @@ -19,23 +20,8 @@ // It covers the individual features that are not covered by the browser or the // AppService. This includes: Vms (Crostini, PluginVm, Borealis), screen // capturer, diction etc. -class VideoConferenceAshFeatureClient - : public crosapi::mojom::VideoConferenceManagerClient { +class VideoConferenceAshFeatureClient : public VideoConferenceClientBase { public: - using AppIdString = std::string; - using VideoConferencePermissions = - video_conference::VideoConferencePermissions; - - // AppState records information that is required for VideoConferenceManagerAsh - // to show correct icons. - struct AppState { - // Used for uniquely identifying an App in VideoConferenceManagerAsh. - base::UnguessableToken token; - base::Time last_activity_time; - bool is_capturing_microphone = false; - bool is_capturing_camera = false; - }; - // The passed `video_conference_manager_ash` must outlive this instance. explicit VideoConferenceAshFeatureClient( VideoConferenceManagerAsh* video_conference_manager_ash); @@ -47,15 +33,8 @@ ~VideoConferenceAshFeatureClient() override; - // crosapi::mojom::VideoConferenceManagerClient overrides. - void GetMediaApps(GetMediaAppsCallback callback) override; void ReturnToApp(const base::UnguessableToken& token, ReturnToAppCallback callback) override; - void SetSystemMediaDeviceStatus( - crosapi::mojom::VideoConferenceMediaDevice device, - bool disabled, - SetSystemMediaDeviceStatusCallback callback) override; - void StopAllScreenShare() override; // Called when VmCameraMicManager change Camera/Mic accessing state. void OnVmDeviceUpdated(VmCameraMicManager::VmType vm_type, @@ -65,45 +44,22 @@ // Returns current VideoConferenceAshFeatureClient. static VideoConferenceAshFeatureClient* Get(); + protected: + // VideoConferenceClientBase overrides. + std::string GetAppName(const AppIdString& app_id) override; + VideoConferencePermissions GetAppPermission( + const AppIdString& app_id) override; + apps::AppType GetAppType(const AppIdString& app_id) override; + private: friend class VideoConferenceAshfeatureClientTest; - // Returns the name of the app with `app_id`. - std::string GetAppName(const AppIdString& app_id); - - // Returns the current camera/microphone permission status for `app_id`. - VideoConferencePermissions GetAppPermission(const AppIdString& app_id); - - // Returns the crosapi::mojom::VideoConferenceAppType of `app_id`. - crosapi::mojom::VideoConferenceAppType GetAppType(const AppIdString& app_id); - // Returns AppState of `app_id`; adds if doesn't exist yet. AppState& GetOrAddAppState(const AppIdString& app_id); // Removes `app_id` from `id_to_app_state_` if there is no running instance // for it. void MaybeRemoveApp(const AppIdString& app_id); - - // Calculates a new `crosapi::mojom::VideoConferenceMediaUsageStatus` from all - // current VC apps and notifies the manager if a field has changed. - void HandleMediaUsageUpdate(); - - // Unique id associated with this client. It is used by the VcManager to - // identify clients. - const base::UnguessableToken client_id_; - - // Current status_ aggregated from all apps in `id_to_app_state_`. - crosapi::mojom::VideoConferenceMediaUsageStatusPtr status_; - - // The following two fields are true if the camera/microphone is system-wide - // software disabled OR disabled via a hardware switch. - bool camera_system_disabled_{false}; - bool microphone_system_disabled_{false}; - - // This records a list of AppState; each represents a video conference app. - std::map<AppIdString, AppState> id_to_app_state_; - - const raw_ref<VideoConferenceManagerAsh> video_conference_manager_ash_; }; } // namespace ash
diff --git a/chrome/browser/ash/video_conference/video_conference_client_base.cc b/chrome/browser/ash/video_conference/video_conference_client_base.cc new file mode 100644 index 0000000..ab67aee --- /dev/null +++ b/chrome/browser/ash/video_conference/video_conference_client_base.cc
@@ -0,0 +1,134 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ash/video_conference/video_conference_client_base.h" + +#include "base/check_deref.h" +#include "base/strings/utf_string_conversions.h" +#include "chrome/browser/ash/video_conference/video_conference_manager_ash.h" + +namespace ash { + +namespace { + +crosapi::mojom::VideoConferenceAppType ToVideoConferenceAppType( + apps::AppType app_type) { + switch (app_type) { + case apps::AppType::kArc: + return crosapi::mojom::VideoConferenceAppType::kArcApp; + case apps::AppType::kChromeApp: + return crosapi::mojom::VideoConferenceAppType::kChromeApp; + case apps::AppType::kWeb: + return crosapi::mojom::VideoConferenceAppType::kWebApp; + case apps::AppType::kExtension: + return crosapi::mojom::VideoConferenceAppType::kChromeExtension; + case apps::AppType::kCrostini: + return crosapi::mojom::VideoConferenceAppType::kCrostiniVm; + case apps::AppType::kPluginVm: + return crosapi::mojom::VideoConferenceAppType::kPluginVm; + case apps::AppType::kBorealis: + return crosapi::mojom::VideoConferenceAppType::kBorealis; + default: + return crosapi::mojom::VideoConferenceAppType::kAppServiceUnknown; + } +} + +} // namespace + +VideoConferenceClientBase::VideoConferenceClientBase( + VideoConferenceManagerAsh* video_conference_manager_ash) + : client_id_(base::UnguessableToken::Create()), + status_(crosapi::mojom::VideoConferenceMediaUsageStatus::New( + /*client_id=*/client_id_, + /*has_media_app=*/false, + /*has_camera_permission=*/false, + /*has_microphone_permission=*/false, + /*is_capturing_camera=*/false, + /*is_capturing_microphone=*/false, + /*is_capturing_screen=*/false)), + video_conference_manager_ash_(CHECK_DEREF(video_conference_manager_ash)) { + video_conference_manager_ash_->RegisterCppClient(this, client_id_); +} + +VideoConferenceClientBase::~VideoConferenceClientBase() { + video_conference_manager_ash_->UnregisterClient(client_id_); +} + +void VideoConferenceClientBase::GetMediaApps(GetMediaAppsCallback callback) { + std::vector<crosapi::mojom::VideoConferenceMediaAppInfoPtr> apps; + + for (const auto& [app_id, app_state] : id_to_app_state_) { + const std::string app_name = GetAppName(app_id); + // app_name should not be empty. + if (app_name.empty()) { + continue; + } + + apps.push_back(crosapi::mojom::VideoConferenceMediaAppInfo::New( + /*id=*/app_state.token, + /*last_activity_time=*/app_state.last_activity_time, + /*is_capturing_camera=*/app_state.is_capturing_camera, + /*is_capturing_microphone=*/app_state.is_capturing_microphone, + /*is_capturing_screen=*/false, + /*title=*/base::UTF8ToUTF16(app_name), + /*url=*/std::nullopt, + /*app_type=*/ToVideoConferenceAppType(GetAppType(app_id)))); + } + + std::move(callback).Run(std::move(apps)); +} +void VideoConferenceClientBase::SetSystemMediaDeviceStatus( + crosapi::mojom::VideoConferenceMediaDevice device, + bool disabled, + SetSystemMediaDeviceStatusCallback callback) { + switch (device) { + case crosapi::mojom::VideoConferenceMediaDevice::kCamera: + camera_system_disabled_ = disabled; + std::move(callback).Run(true); + return; + case crosapi::mojom::VideoConferenceMediaDevice::kMicrophone: + microphone_system_disabled_ = disabled; + std::move(callback).Run(true); + return; + case crosapi::mojom::VideoConferenceMediaDevice::kUnusedDefault: + std::move(callback).Run(false); + return; + } +} + +void VideoConferenceClientBase::StopAllScreenShare() {} + +void VideoConferenceClientBase::HandleMediaUsageUpdate() { + crosapi::mojom::VideoConferenceMediaUsageStatusPtr new_status = + crosapi::mojom::VideoConferenceMediaUsageStatus::New(); + new_status->client_id = client_id_; + new_status->has_media_app = !id_to_app_state_.empty(); + + for (const auto& [app_id, app_state] : id_to_app_state_) { + new_status->is_capturing_camera |= app_state.is_capturing_camera; + new_status->is_capturing_microphone |= app_state.is_capturing_microphone; + + VideoConferencePermissions permissions = GetAppPermission(app_id); + new_status->has_camera_permission |= permissions.has_camera_permission; + new_status->has_microphone_permission |= + permissions.has_microphone_permission; + } + + // If `status` equals the previously sent status, don't notify manager. + if (new_status.Equals(status_)) { + return; + } + status_ = new_status->Clone(); + + auto callback = base::BindOnce([](bool success) { + if (!success) { + LOG(ERROR) + << "VideoConferenceManager::NotifyMediaUsageUpdate did not succeed."; + } + }); + video_conference_manager_ash_->NotifyMediaUsageUpdate(std::move(new_status), + std::move(callback)); +} + +} // namespace ash
diff --git a/chrome/browser/ash/video_conference/video_conference_client_base.h b/chrome/browser/ash/video_conference/video_conference_client_base.h new file mode 100644 index 0000000..8072fcd --- /dev/null +++ b/chrome/browser/ash/video_conference/video_conference_client_base.h
@@ -0,0 +1,84 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_ASH_VIDEO_CONFERENCE_VIDEO_CONFERENCE_CLIENT_BASE_H_ +#define CHROME_BROWSER_ASH_VIDEO_CONFERENCE_VIDEO_CONFERENCE_CLIENT_BASE_H_ + +#include "base/memory/raw_ref.h" +#include "base/time/time.h" +#include "base/unguessable_token.h" +#include "chrome/browser/chromeos/video_conference/video_conference_manager_client_common.h" +#include "chromeos/crosapi/mojom/video_conference.mojom.h" +#include "components/services/app_service/public/cpp/app_types.h" + +namespace ash { + +class VideoConferenceManagerAsh; + +// Base class for Video Conference Manager clients in Ash-chrome. This class +// provides a common implementation for clients that interact with the +// VideoConferenceManagerAsh. +class VideoConferenceClientBase + : public crosapi::mojom::VideoConferenceManagerClient { + protected: + explicit VideoConferenceClientBase( + VideoConferenceManagerAsh* video_conference_manager_ash); + ~VideoConferenceClientBase() override; + + using AppIdString = std::string; + using VideoConferencePermissions = + video_conference::VideoConferencePermissions; + + // AppState records information that is required for VideoConferenceManagerAsh + // to show correct icons. + struct AppState { + // Used for uniquely identifying an App in VideoConferenceManagerAsh. + base::UnguessableToken token; + base::Time last_activity_time; + bool is_capturing_microphone = false; + bool is_capturing_camera = false; + }; + + // crosapi::mojom::VideoConferenceManagerClient: + void GetMediaApps(GetMediaAppsCallback callback) override; + void SetSystemMediaDeviceStatus( + crosapi::mojom::VideoConferenceMediaDevice device, + bool disabled, + SetSystemMediaDeviceStatusCallback callback) override; + void StopAllScreenShare() override; + + // Calculates a new `crosapi::mojom::VideoConferenceMediaUsageStatus` from all + // current VC apps and notifies the manager if a field has changed. + void HandleMediaUsageUpdate(); + + // Returns the name of the app with `app_id`. This name is used for display + // in notifications and other UI surfaces. + virtual std::string GetAppName(const AppIdString& app_id) = 0; + // Returns the current camera and microphone permission status for the app + // with `app_id`. + virtual VideoConferencePermissions GetAppPermission( + const AppIdString& app_id) = 0; + // Returns the type of the app with `app_id`. This is used by the manager + // to distinguish between different kinds of applications. + virtual apps::AppType GetAppType(const AppIdString& app_id) = 0; + + bool camera_system_disabled_{false}; + bool microphone_system_disabled_{false}; + + // This records a list of AppState; each represents a video conference app. + std::map<AppIdString, AppState> id_to_app_state_; + + // Unique id associated with this client. It is used by the VcManager to + // identify clients. + const base::UnguessableToken client_id_; + + // Current status_ aggregated from all apps in `id_to_app_state_`. + crosapi::mojom::VideoConferenceMediaUsageStatusPtr status_; + + const raw_ref<VideoConferenceManagerAsh> video_conference_manager_ash_; +}; + +} // namespace ash + +#endif // CHROME_BROWSER_ASH_VIDEO_CONFERENCE_VIDEO_CONFERENCE_CLIENT_BASE_H_
diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/bar/BookmarkBarUtils.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/bar/BookmarkBarUtils.java index b214ab2..f14ab23ce 100644 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/bar/BookmarkBarUtils.java +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/bar/BookmarkBarUtils.java
@@ -151,7 +151,8 @@ * Returns true if the device is compatible with, and can support, the Bookmark Bar, and * therefore if the feature should be exposed to the user. If true, user flows such as keyboard * shortcuts, IPH, settings toggles, device policies, etc should be present. This value should - * always return the same value for a device. + * always return the same value for a device. Compatible devices include Desktop, large tablets, + * and foldables. * * <p>Check this value when determining which user actions to expose to users for the Bookmark * Bar. @@ -169,7 +170,8 @@ return sDeviceBookmarkBarCompatibleForTesting; } return ChromeFeatureList.sAndroidBookmarkBar.isEnabled() - && DeviceFormFactor.isNonMultiDisplayContextOnTablet(context); + && (DeviceFormFactor.isNonMultiDisplayContextOnTablet(context) + || DeviceInfo.isFoldable()); } /**
diff --git a/chrome/browser/chromeos/app_mode/DEPS b/chrome/browser/chromeos/app_mode/DEPS index b46883e..6dead8a 100644 --- a/chrome/browser/chromeos/app_mode/DEPS +++ b/chrome/browser/chromeos/app_mode/DEPS
@@ -24,9 +24,7 @@ "+chrome/browser/extensions/external_loader.h", "+chrome/browser/extensions/external_provider_impl.h", "+chrome/browser/extensions/forced_extensions/install_stage_tracker.h", - "+chrome/browser/extensions/install_observer.h", "+chrome/browser/extensions/install_tracker_factory.h", - "+chrome/browser/extensions/install_tracker.h", "+chrome/browser/extensions/updater", "+chrome/browser/lifetime", "+chrome/browser/profiles/profile.h",
diff --git a/chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h b/chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h index 3bf3634..e4e6cc48 100644 --- a/chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h +++ b/chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h
@@ -16,9 +16,9 @@ #include "base/time/time.h" #include "chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.h" #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h" -#include "chrome/browser/extensions/install_observer.h" -#include "chrome/browser/extensions/install_tracker.h" #include "chromeos/crosapi/mojom/chrome_app_kiosk_service.mojom.h" +#include "extensions/browser/install_observer.h" +#include "extensions/browser/install_tracker.h" #include "extensions/common/extension_id.h" class Profile;
diff --git a/chrome/browser/collaboration/android/java/src/org/chromium/chrome/browser/collaboration/messaging/TestMessagingBackendService.java b/chrome/browser/collaboration/android/java/src/org/chromium/chrome/browser/collaboration/messaging/TestMessagingBackendService.java index 6ab68a5..2704170 100644 --- a/chrome/browser/collaboration/android/java/src/org/chromium/chrome/browser/collaboration/messaging/TestMessagingBackendService.java +++ b/chrome/browser/collaboration/android/java/src/org/chromium/chrome/browser/collaboration/messaging/TestMessagingBackendService.java
@@ -10,12 +10,12 @@ import org.chromium.components.collaboration.messaging.ActivityLogQueryParams; import org.chromium.components.collaboration.messaging.MessagingBackendService; import org.chromium.components.collaboration.messaging.PersistentMessage; +import org.chromium.components.collaboration.messaging.PersistentNotificationType; import org.chromium.components.tab_group_sync.EitherId.EitherGroupId; import org.chromium.components.tab_group_sync.EitherId.EitherTabId; import java.util.ArrayList; import java.util.List; -import java.util.Optional; /** Test implementation of the MessagingBackendService. */ class TestMessagingBackendService implements MessagingBackendService { @@ -36,21 +36,20 @@ @Override @NonNull public List<PersistentMessage> getMessagesForTab( - EitherTabId tabId, Optional</* @PersistentNotificationType */ Integer> type) { + EitherTabId tabId, @PersistentNotificationType int type) { return new ArrayList<>(); } @Override @NonNull public List<PersistentMessage> getMessagesForGroup( - EitherGroupId groupId, Optional</* @PersistentNotificationType */ Integer> type) { + EitherGroupId groupId, @PersistentNotificationType int type) { return new ArrayList<>(); } @Override @NonNull - public List<PersistentMessage> getMessages( - Optional</* @PersistentNotificationType */ Integer> type) { + public List<PersistentMessage> getMessages(@PersistentNotificationType int type) { return new ArrayList<>(); } @@ -64,6 +63,5 @@ public void clearDirtyTabMessagesForGroup(String collaborationId) {} @Override - public void clearPersistentMessage( - String messageId, Optional</* @PersistentNotificationType */ Integer> type) {} + public void clearPersistentMessage(String messageId, @PersistentNotificationType int type) {} }
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 64e27cde..a8e054b 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn
@@ -28,8 +28,6 @@ # TODO(https://crbug.com/356905053): When files support being built on # desktop android, move them here, outside the if (enable_extensions) block. sources = [ - "active_install_data.cc", - "active_install_data.h", "activity_log/activity_action_constants.cc", "activity_log/activity_action_constants.h", "activity_log/activity_actions.cc", @@ -379,14 +377,10 @@ "forced_extensions/install_stage_tracker_factory.h", "install_approval.cc", "install_approval.h", - "install_observer.cc", - "install_observer.h", "install_prompt_permissions.cc", "install_prompt_permissions.h", "install_signer.cc", "install_signer.h", - "install_tracker.cc", - "install_tracker.h", "install_tracker_factory.cc", "install_tracker_factory.h", "install_verifier.cc", @@ -440,8 +434,6 @@ "profile_util.h", "safe_browsing_verdict_handler.cc", "safe_browsing_verdict_handler.h", - "scoped_active_install.cc", - "scoped_active_install.h", "settings_api_helpers.cc", "settings_api_helpers.h", "shared_module_service.cc",
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc index 4f0de53..def9498f7 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
@@ -947,8 +947,6 @@ EXPECT_EQ(std::string("File selection was canceled."), function->GetError()); } -// TODO(crbug.com/439448250): Enable on desktop android. -#if BUILDFLAG(ENABLE_EXTENSIONS) // Test developerPrivate.loadUnpacked. TEST_F(DeveloperPrivateApiUnitTest, DeveloperPrivateLoadUnpacked) { std::unique_ptr<content::WebContents> web_contents( @@ -974,7 +972,17 @@ function = base::MakeRefCounted<api::DeveloperPrivateLoadUnpackedFunction>(); base::FilePath path = data_dir().AppendASCII("simple_with_popup"); function->set_accept_dialog_for_testing(true); +#if BUILDFLAG(IS_ANDROID) + base::ScopedTempDir temp_dir_copy; + ASSERT_TRUE(temp_dir_copy.CreateUniqueTempDir()); + + base::FilePath cache_path = + *base::test::android::CreateCacheCopyAndGetContentUri(path, + temp_dir_copy); + function->set_selected_file_for_testing(ui::SelectedFileInfo(cache_path)); +#else function->set_selected_file_for_testing(ui::SelectedFileInfo(path)); +#endif // BUILDFLAG(IS_ANDROID) function->SetRenderFrameHost(web_contents->GetPrimaryMainFrame()); // Function should succeed and extension is added. @@ -984,15 +992,29 @@ registry()->enabled_extensions().GetIDs(), current_ids); ASSERT_EQ(1u, id_difference.size()); // The new extension should have the same path. +#if BUILDFLAG(IS_ANDROID) + // In Android, the unpacked extension source will be resolved as virtual + // document path. + EXPECT_EQ( + *base::ResolveToVirtualDocumentPath(cache_path), + registry()->enabled_extensions().GetByID(*id_difference.begin())->path()); +#else EXPECT_EQ( path, registry()->enabled_extensions().GetByID(*id_difference.begin())->path()); +#endif // BUILDFLAG(IS_ANDROID) // Try loading a bad extension and accepting the dialog. function = base::MakeRefCounted<api::DeveloperPrivateLoadUnpackedFunction>(); path = data_dir().AppendASCII("empty_manifest"); function->set_accept_dialog_for_testing(true); +#if BUILDFLAG(IS_ANDROID) + cache_path = *base::test::android::CreateCacheCopyAndGetContentUri( + path, temp_dir_copy); + function->set_selected_file_for_testing(ui::SelectedFileInfo(cache_path)); +#else function->set_selected_file_for_testing(ui::SelectedFileInfo(path)); +#endif // BUILDFLAG(IS_ANDROID) function->SetRenderFrameHost(web_contents->GetPrimaryMainFrame()); base::Value::List unpacked_args; base::Value::Dict options; @@ -1008,6 +1030,8 @@ .size()); } +// TODO(crbug.com/439448250): Enable on desktop android. +#if BUILDFLAG(ENABLE_EXTENSIONS) TEST_F(DeveloperPrivateApiUnitTest, DeveloperPrivateLoadUnpackedLoadError) { std::unique_ptr<content::WebContents> web_contents( content::WebContentsTester::CreateTestWebContents(profile(), nullptr));
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 802854e..c9e918db 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -33,10 +33,9 @@ #include "chrome/browser/extensions/extension_allowlist.h" #include "chrome/browser/extensions/extension_management.h" #include "chrome/browser/extensions/install_approval.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/manifest_v2_experiment_manager.h" #include "chrome/browser/extensions/mv2_experiment_stage.h" -#include "chrome/browser/extensions/scoped_active_install.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_observer.h" #include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h" @@ -64,6 +63,8 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_util.h" #include "extensions/browser/extensions_browser_client.h" +#include "extensions/browser/install_tracker.h" +#include "extensions/browser/scoped_active_install.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" @@ -445,7 +446,8 @@ } } - InstallTracker* tracker = InstallTracker::Get(browser_context()); + InstallTracker* tracker = + InstallTrackerFactory::GetForBrowserContext(browser_context()); DCHECK(tracker); bool is_installed = ExtensionRegistry::Get(browser_context()) @@ -1022,7 +1024,8 @@ } scoped_active_install_ = std::make_unique<ScopedActiveInstall>( - InstallTracker::Get(browser_context()), params->expected_id); + InstallTrackerFactory::GetForBrowserContext(browser_context()), + params->expected_id); // Balanced in OnExtensionInstallSuccess() or OnExtensionInstallFailure(). AddRef();
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h index fae9229..fb7c99a 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.h +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.h
@@ -13,7 +13,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h" -#include "chrome/browser/extensions/active_install_data.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/webstore_install_helper.h" #include "chrome/browser/extensions/webstore_installer.h" @@ -21,6 +20,7 @@ #include "chrome/common/buildflags.h" #include "chrome/common/extensions/api/webstore_private.h" #include "chrome/common/extensions/webstore_install_result.h" +#include "extensions/browser/active_install_data.h" #include "extensions/browser/extension_function.h" #include "extensions/browser/supervised_user_extensions_delegate.h" #include "extensions/buildflags/buildflags.h"
diff --git a/chrome/browser/extensions/chrome_app_sorting.cc b/chrome/browser/extensions/chrome_app_sorting.cc index d0ff5e8..176e9f0 100644 --- a/chrome/browser/extensions/chrome_app_sorting.cc +++ b/chrome/browser/extensions/chrome_app_sorting.cc
@@ -15,7 +15,7 @@ #include "base/task/sequenced_task_runner.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/sync/extension_sync_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/web_app.h" @@ -27,6 +27,7 @@ #include "components/webapps/common/web_app_id.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/install_tracker.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_id.h" @@ -254,7 +255,8 @@ } } } - InstallTracker::Get(browser_context_)->OnAppsReordered(std::nullopt); + InstallTrackerFactory::GetForBrowserContext(browser_context_) + ->OnAppsReordered(std::nullopt); } void ChromeAppSorting::EnsureValidOrdinals( @@ -333,7 +335,8 @@ SyncIfNeeded(moved_extension_id); - InstallTracker::Get(browser_context_)->OnAppsReordered(moved_extension_id); + InstallTrackerFactory::GetForBrowserContext(browser_context_) + ->OnAppsReordered(moved_extension_id); } syncer::StringOrdinal ChromeAppSorting::GetAppLaunchOrdinal(
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 1025d60..064e0ea 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc
@@ -31,7 +31,6 @@ #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h" #include "chrome/browser/extensions/install_approval.h" -#include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/load_error_reporter.h" #include "chrome/browser/extensions/permissions/permissions_updater.h" @@ -58,6 +57,7 @@ #include "extensions/browser/install/crx_install_error.h" #include "extensions/browser/install_flag.h" #include "extensions/browser/install_stage.h" +#include "extensions/browser/install_tracker.h" #include "extensions/browser/policy_check.h" #include "extensions/browser/preload_check_group.h" #include "extensions/browser/requirements_checker.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector.cc b/chrome/browser/extensions/extension_garbage_collector.cc index 43f19f2..7fd38e21 100644 --- a/chrome/browser/extensions/extension_garbage_collector.cc +++ b/chrome/browser/extensions/extension_garbage_collector.cc
@@ -24,7 +24,7 @@ #include "base/time/time.h" #include "chrome/browser/extensions/extension_garbage_collector_factory.h" #include "chrome/browser/extensions/extension_util.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/crx_file/id_util.h" #include "content/public/browser/browser_context.h" @@ -35,6 +35,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/extension_util.h" +#include "extensions/browser/install_tracker.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" #include "extensions/common/extension_id.h" @@ -144,7 +145,7 @@ weak_factory_.GetWeakPtr()), kGarbageCollectStartupDelay); - InstallTracker::Get(context_)->AddObserver(this); + InstallTrackerFactory::GetForBrowserContext(context_)->AddObserver(this); } ExtensionGarbageCollector::~ExtensionGarbageCollector() = default; @@ -156,7 +157,7 @@ } void ExtensionGarbageCollector::Shutdown() { - InstallTracker::Get(context_)->RemoveObserver(this); + InstallTrackerFactory::GetForBrowserContext(context_)->RemoveObserver(this); } void ExtensionGarbageCollector::GarbageCollectExtensionsForTest() {
diff --git a/chrome/browser/extensions/extension_garbage_collector.h b/chrome/browser/extensions/extension_garbage_collector.h index c9d1472..de71d1d 100644 --- a/chrome/browser/extensions/extension_garbage_collector.h +++ b/chrome/browser/extensions/extension_garbage_collector.h
@@ -11,8 +11,8 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/extensions/install_observer.h" #include "components/keyed_service/core/keyed_service.h" +#include "extensions/browser/install_observer.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension_id.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_unittest.cc index 5568a7ed..a133793e9 100644 --- a/chrome/browser/extensions/extension_garbage_collector_unittest.cc +++ b/chrome/browser/extensions/extension_garbage_collector_unittest.cc
@@ -12,7 +12,7 @@ #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/test/base/testing_profile.h" @@ -21,6 +21,7 @@ #include "content/public/test/browser_task_environment.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_prefs.h" +#include "extensions/browser/install_tracker.h" #include "extensions/browser/pref_names.h" #include "extensions/common/extension_features.h" #include "extensions/common/extension_id.h" @@ -142,7 +143,8 @@ service_->Init(); // Simulate a CRX installation. - InstallTracker::Get(profile_.get())->OnBeginCrxInstall(kExtensionId); + InstallTrackerFactory::GetForBrowserContext(profile_.get()) + ->OnBeginCrxInstall(kExtensionId); GarbageCollectExtensions(); @@ -152,7 +154,7 @@ ASSERT_TRUE(base::PathExists(extension_dir)); // Finish CRX installation and re-run garbage collection. - InstallTracker::Get(profile_.get()) + InstallTrackerFactory::GetForBrowserContext(profile_.get()) ->OnFinishCrxInstall(base::FilePath(), kExtensionId, nullptr, false); GarbageCollectExtensions();
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index ed26cb3..6e03a48 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -17,7 +17,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/values.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/common/chrome_paths.h" #include "components/content_settings/core/browser/content_settings_registry.h" #include "components/content_settings/core/common/content_settings.h" @@ -35,6 +35,7 @@ #include "extensions/browser/extension_prefs_observer.h" #include "extensions/browser/install_flag.h" #include "extensions/browser/install_prefs_helper.h" +#include "extensions/browser/install_tracker.h" #include "extensions/browser/pref_names.h" #include "extensions/browser/pref_types.h" #include "extensions/common/extension.h" @@ -75,7 +76,7 @@ // Shutdown the InstallTracker early, which is a dependency on some // ExtensionPrefTests (and depends on PrefService being available in // shutdown). - InstallTracker::Get(prefs_.profile())->Shutdown(); + InstallTrackerFactory::GetForBrowserContext(prefs_.profile())->Shutdown(); // Reset ExtensionPrefs, and re-verify. prefs_.ResetPrefRegistry();
diff --git a/chrome/browser/extensions/install_tracker_factory.cc b/chrome/browser/extensions/install_tracker_factory.cc index 2241d2df..0189bab 100644 --- a/chrome/browser/extensions/install_tracker_factory.cc +++ b/chrome/browser/extensions/install_tracker_factory.cc
@@ -5,15 +5,13 @@ #include "chrome/browser/extensions/install_tracker_factory.h" #include "base/no_destructor.h" -#include "chrome/browser/extensions/install_tracker.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" +#include "extensions/browser/install_tracker.h" #include "extensions/buildflags/buildflags.h" -static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); - namespace extensions { // static
diff --git a/chrome/browser/extensions/omaha_attributes_handler.cc b/chrome/browser/extensions/omaha_attributes_handler.cc index 26de48e..0d0e7d6 100644 --- a/chrome/browser/extensions/omaha_attributes_handler.cc +++ b/chrome/browser/extensions/omaha_attributes_handler.cc
@@ -13,6 +13,9 @@ #include "extensions/browser/blocklist_state.h" #include "extensions/browser/extension_registrar.h" #include "extensions/browser/extension_registry.h" +#include "extensions/buildflags/buildflags.h" + +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); namespace extensions {
diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc index b0fc2c73..2ddcb38 100644 --- a/chrome/browser/extensions/pack_extension_job.cc +++ b/chrome/browser/extensions/pack_extension_job.cc
@@ -14,6 +14,7 @@ #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_creator.h" #include "extensions/browser/extension_file_task_runner.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/constants.h" #include "ui/base/l10n/l10n_util.h" @@ -21,6 +22,8 @@ #include "chrome/browser/ui/android/extensions/extension_util_bridge.h" #endif // BUILDFLAG(IS_ANDROID) +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + using content::BrowserThread; namespace extensions {
diff --git a/chrome/browser/extensions/permissions/active_tab_permission_granter.cc b/chrome/browser/extensions/permissions/active_tab_permission_granter.cc index 0412c1d53..e867dc1 100644 --- a/chrome/browser/extensions/permissions/active_tab_permission_granter.cc +++ b/chrome/browser/extensions/permissions/active_tab_permission_granter.cc
@@ -27,6 +27,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/browser/renderer_startup_helper.h" #include "extensions/browser/script_injection_tracker.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_id.h" @@ -38,6 +39,8 @@ #include "extensions/common/user_script.h" #include "url/gurl.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { namespace {
diff --git a/chrome/browser/extensions/permissions/scripting_permissions_modifier.cc b/chrome/browser/extensions/permissions/scripting_permissions_modifier.cc index 88ce0a6..0a0b907b 100644 --- a/chrome/browser/extensions/permissions/scripting_permissions_modifier.cc +++ b/chrome/browser/extensions/permissions/scripting_permissions_modifier.cc
@@ -11,6 +11,7 @@ #include "extensions/browser/extension_util.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/permissions_manager.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/permissions_parser.h" #include "extensions/common/permissions/permission_set.h" @@ -19,6 +20,8 @@ #include "extensions/common/url_pattern_set.h" #include "extensions/common/user_script.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { ScriptingPermissionsModifier::ScriptingPermissionsModifier(
diff --git a/chrome/browser/extensions/permissions_based_management_policy_provider.cc b/chrome/browser/extensions/permissions_based_management_policy_provider.cc index 79c7bdc..d8ed8ec 100644 --- a/chrome/browser/extensions/permissions_based_management_policy_provider.cc +++ b/chrome/browser/extensions/permissions_based_management_policy_provider.cc
@@ -8,12 +8,15 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_management.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/permissions_parser.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/strings/grit/extensions_strings.h" #include "ui/base/l10n/l10n_util.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { PermissionsBasedManagementPolicyProvider::
diff --git a/chrome/browser/extensions/permissions_url_constants.cc b/chrome/browser/extensions/permissions_url_constants.cc index 2ee775f..25ec9cd6 100644 --- a/chrome/browser/extensions/permissions_url_constants.cc +++ b/chrome/browser/extensions/permissions_url_constants.cc
@@ -4,6 +4,10 @@ #include "chrome/browser/extensions/permissions_url_constants.h" +#include "extensions/buildflags/buildflags.h" + +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extension_permissions_constants { // The link to the help article for runtime host permissions.
diff --git a/chrome/browser/extensions/policy_handlers.cc b/chrome/browser/extensions/policy_handlers.cc index 71775ecd..21e5576e 100644 --- a/chrome/browser/extensions/policy_handlers.cc +++ b/chrome/browser/extensions/policy_handlers.cc
@@ -31,6 +31,7 @@ #include "components/prefs/pref_value_map.h" #include "components/strings/grit/components_strings.h" #include "extensions/browser/pref_names.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/extension_urls.h" #include "extensions/common/url_pattern.h" #include "url/gurl.h" @@ -39,6 +40,8 @@ #include "base/enterprise_util.h" #endif +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { namespace { // Returns true if extensions_ids contains a list of valid extension ids,
diff --git a/chrome/browser/extensions/policy_handlers.h b/chrome/browser/extensions/policy_handlers.h index 45f06ff..b3bc57b 100644 --- a/chrome/browser/extensions/policy_handlers.h +++ b/chrome/browser/extensions/policy_handlers.h
@@ -10,6 +10,9 @@ #include "base/values.h" #include "build/build_config.h" #include "components/policy/core/browser/configuration_policy_handler.h" +#include "extensions/buildflags/buildflags.h" + +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); namespace policy { class PolicyMap;
diff --git a/chrome/browser/extensions/pref_mapping.cc b/chrome/browser/extensions/pref_mapping.cc index 0226d3ec..41b0671 100644 --- a/chrome/browser/extensions/pref_mapping.cc +++ b/chrome/browser/extensions/pref_mapping.cc
@@ -24,11 +24,14 @@ #include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/spellcheck/browser/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" +#include "extensions/buildflags/buildflags.h" #if BUILDFLAG(IS_CHROMEOS) #include "ash/constants/ash_pref_names.h" #endif +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + using extensions::mojom::APIPermissionID; namespace extensions {
diff --git a/chrome/browser/extensions/pref_transformer_interface.h b/chrome/browser/extensions/pref_transformer_interface.h index a9734dd..44e7c959 100644 --- a/chrome/browser/extensions/pref_transformer_interface.h +++ b/chrome/browser/extensions/pref_transformer_interface.h
@@ -8,6 +8,10 @@ #include <optional> #include <string> +#include "extensions/buildflags/buildflags.h" + +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace base { class Value; }
diff --git a/chrome/browser/extensions/preference/preference_helpers.cc b/chrome/browser/extensions/preference/preference_helpers.cc index f0826016..9682284 100644 --- a/chrome/browser/extensions/preference/preference_helpers.cc +++ b/chrome/browser/extensions/preference/preference_helpers.cc
@@ -17,10 +17,13 @@ #include "extensions/browser/extension_prefs_helper.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_util.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/extension_id.h" #include "extensions/common/manifest_handlers/incognito_info.h" #include "extensions/common/permissions/permissions_data.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { namespace preference_helpers {
diff --git a/chrome/browser/extensions/profile_util.cc b/chrome/browser/extensions/profile_util.cc index df6ed34..9c54b89e 100644 --- a/chrome/browser/extensions/profile_util.cc +++ b/chrome/browser/extensions/profile_util.cc
@@ -8,12 +8,15 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "extensions/buildflags/buildflags.h" #if BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/ash/profiles/profile_helper.h" #include "components/user_manager/user.h" #endif // BUILDFLAG(IS_CHROMEOS) +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions::profile_util { bool ProfileCanUseNonComponentExtensions(const Profile* profile) {
diff --git a/chrome/browser/extensions/safe_browsing_verdict_handler.cc b/chrome/browser/extensions/safe_browsing_verdict_handler.cc index 2ab7be5..20f09c22 100644 --- a/chrome/browser/extensions/safe_browsing_verdict_handler.cc +++ b/chrome/browser/extensions/safe_browsing_verdict_handler.cc
@@ -11,8 +11,11 @@ #include "extensions/browser/blocklist_state.h" #include "extensions/browser/extension_registrar.h" #include "extensions/browser/extension_registry.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { namespace {
diff --git a/chrome/browser/extensions/settings_api_helpers.cc b/chrome/browser/extensions/settings_api_helpers.cc index 5a24d43..7a0a4f1 100644 --- a/chrome/browser/extensions/settings_api_helpers.cc +++ b/chrome/browser/extensions/settings_api_helpers.cc
@@ -13,10 +13,13 @@ #include "extensions/browser/extension_pref_value_map_factory.h" #include "extensions/browser/extension_prefs_helper.h" #include "extensions/browser/extension_registry.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/constants.h" #include "extensions/common/extension_set.h" #include "url/gurl.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { namespace {
diff --git a/chrome/browser/extensions/shared_module_service.cc b/chrome/browser/extensions/shared_module_service.cc index afc48bc2..d79b65d 100644 --- a/chrome/browser/extensions/shared_module_service.cc +++ b/chrome/browser/extensions/shared_module_service.cc
@@ -16,9 +16,12 @@ #include "extensions/browser/extension_registrar.h" #include "extensions/browser/pending_extension_manager.h" #include "extensions/browser/uninstall_reason.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" #include "extensions/common/extension_urls.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { namespace {
diff --git a/chrome/browser/extensions/shared_module_service_factory.cc b/chrome/browser/extensions/shared_module_service_factory.cc index a2a8627..334e8fb4 100644 --- a/chrome/browser/extensions/shared_module_service_factory.cc +++ b/chrome/browser/extensions/shared_module_service_factory.cc
@@ -14,6 +14,9 @@ #include "extensions/browser/extension_registrar_factory.h" #include "extensions/browser/extension_registry_factory.h" #include "extensions/browser/pending_extension_manager_factory.h" +#include "extensions/buildflags/buildflags.h" + +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); using content::BrowserContext;
diff --git a/chrome/browser/extensions/standard_management_policy_provider.cc b/chrome/browser/extensions/standard_management_policy_provider.cc index 3dfb112..875fc77 100644 --- a/chrome/browser/extensions/standard_management_policy_provider.cc +++ b/chrome/browser/extensions/standard_management_policy_provider.cc
@@ -12,12 +12,15 @@ #include "chrome/browser/extensions/managed_installation_mode.h" #include "chrome/browser/extensions/manifest_v2_experiment_manager.h" #include "chrome/grit/generated_resources.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/strings/grit/extensions_strings.h" #include "ui/base/l10n/l10n_util.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + namespace extensions { namespace {
diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index d1a8dab6..93670a53 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc
@@ -19,9 +19,12 @@ #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_file_task_runner.h" #include "extensions/browser/sandboxed_unpacker.h" +#include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" #include "extensions/common/verifier_formats.h" +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); + using content::BrowserThread; namespace extensions {
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 825b31d3..4b36857 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc
@@ -34,7 +34,6 @@ #include "chrome/browser/download/download_stats.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/install_approval.h" -#include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/install_verifier.h" #include "chrome/browser/extensions/manifest_check_level.h" @@ -57,6 +56,7 @@ #include "extensions/browser/extension_file_task_runner.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/install/crx_install_error.h" +#include "extensions/browser/install_tracker.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" #include "extensions/common/extension_features.h"
diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc index 79623dd..b6644eed 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.cc +++ b/chrome/browser/extensions/webstore_standalone_installer.cc
@@ -16,8 +16,7 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/install_approval.h" -#include "chrome/browser/extensions/install_tracker.h" -#include "chrome/browser/extensions/scoped_active_install.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/webstore_data_fetcher.h" #include "chrome/browser/profiles/profile.h" #include "components/crx_file/id_util.h" @@ -27,6 +26,8 @@ #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registrar.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/install_tracker.h" +#include "extensions/browser/scoped_active_install.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension.h" #include "extensions/common/extension_urls.h" @@ -106,7 +107,8 @@ bool WebstoreStandaloneInstaller::EnsureUniqueInstall( webstore_install::Result* reason, std::string* error) { - InstallTracker* tracker = InstallTracker::Get(profile_); + InstallTracker* tracker = + InstallTrackerFactory::GetForBrowserContext(profile_); DCHECK(tracker); const ActiveInstallData* existing_install_data =
diff --git a/chrome/browser/extensions/webstore_standalone_installer.h b/chrome/browser/extensions/webstore_standalone_installer.h index 23660da..07c0acbb 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.h +++ b/chrome/browser/extensions/webstore_standalone_installer.h
@@ -14,7 +14,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" -#include "chrome/browser/extensions/active_install_data.h" #include "chrome/browser/extensions/cws_item_service.pb.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h" @@ -23,6 +22,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_observer.h" #include "chrome/common/extensions/webstore_install_result.h" +#include "extensions/browser/active_install_data.h" #include "extensions/buildflags/buildflags.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc index 61ec1c9..3baee99 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -364,6 +364,7 @@ &kPageAnnotationsService, &kPageContentProvider, &kPCCTMinimumHeight, + &kChromeItemPickerUi, &kPowerSavingModeBroadcastReceiverInBackground, &kPreconnectOnTabCreation, &kPriceChangeModule, @@ -769,6 +770,8 @@ BASE_FEATURE(kCCTResetTimeoutEnabled, base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kChromeItemPickerUi, base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kChromeNativeUrlOverriding, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kChangeUnfocusedPriority, base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h index 6afd103c..0ed863b1 100644 --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -116,6 +116,7 @@ BASE_DECLARE_FEATURE(kCCTTabModalDialog); BASE_DECLARE_FEATURE(kCCTToolbarRefactor); BASE_DECLARE_FEATURE(kCCTResetTimeoutEnabled); +BASE_DECLARE_FEATURE(kChromeItemPickerUi); BASE_DECLARE_FEATURE(kDefaultBrowserPromoAndroid2); BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls); BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting);
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 95dcde9f..3c0a4ca9 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
@@ -346,6 +346,7 @@ public static final String CCT_TAB_MODAL_DIALOG = "CCTTabModalDialog"; public static final String CCT_TOOLBAR_REFACTOR = "CCTToolbarRefactor"; public static final String CHANGE_UNFOCUSED_PRIORITY = "ChangeUnfocusedPriority"; + public static final String CHROME_ITEM_PICKER_UI = "ChromeItemPickerUi"; public static final String CHROME_NATIVE_URL_OVERRIDING = "ChromeNativeUrlOverriding"; public static final String CHROME_SURVEY_NEXT_ANDROID = "ChromeSurveyNextAndroid"; public static final String CLAMP_AUTOMOTIVE_SCALING = "ClampAutomotiveScaling"; @@ -872,6 +873,8 @@ public static final CachedFlag sCctTabModalDialog = newCachedFlag(CCT_TAB_MODAL_DIALOG, true); public static final CachedFlag sCctToolbarRefactor = newCachedFlag(CCT_TOOLBAR_REFACTOR, false, true); + public static final CachedFlag sChromeItemPickerUi = + newCachedFlag(CHROME_ITEM_PICKER_UI, /* defaultValue= */ false); public static final CachedFlag sClampAutomotiveScaling = newCachedFlag(CLAMP_AUTOMOTIVE_SCALING, true); public static final CachedFlag sClankStartupLatencyInjection = @@ -1164,6 +1167,7 @@ sCctRevampedBranding, sCctTabModalDialog, sCctToolbarRefactor, + sChromeItemPickerUi, sClampAutomotiveScaling, sClankStartupLatencyInjection, sCleanupLegacyTabState,
diff --git a/chrome/browser/glic/e2e_test/internal b/chrome/browser/glic/e2e_test/internal index 93b10fd..40c552c 160000 --- a/chrome/browser/glic/e2e_test/internal +++ b/chrome/browser/glic/e2e_test/internal
@@ -1 +1 @@ -Subproject commit 93b10fd906d1b7d3a7ed6c1149e7fd942182300c +Subproject commit 40c552cebdfc271664330b1eaf9c010bb3f73ec2
diff --git a/chrome/browser/glic/host/glic_ui.cc b/chrome/browser/glic/host/glic_ui.cc index 12d990e..1492290 100644 --- a/chrome/browser/glic/host/glic_ui.cc +++ b/chrome/browser/glic/host/glic_ui.cc
@@ -167,13 +167,17 @@ source->AddBoolean("enableWebClientUnresponsiveMetrics", base::FeatureList::IsEnabled( features::kGlicWebClientUnresponsiveMetrics)); + std::string admin_blocked_redirect_patterns; if (base::FeatureList::IsEnabled(features::kGlicCaaGuestError)) { - source->AddString( - "adminBlockedRedirectOrigins", - "https://access.workspace.google.com https://admin.google.com"); - } else { - source->AddString("adminBlockedRedirectOrigins", ""); + admin_blocked_redirect_patterns = command_line->GetSwitchValueASCII( + ::switches::kGlicAdminRedirectPatterns); + if (admin_blocked_redirect_patterns.empty()) { + admin_blocked_redirect_patterns = + features::kGlicCaaGuestRedirectPatterns.Get(); + } } + source->AddString("adminBlockedRedirectPatterns", + admin_blocked_redirect_patterns); } WEB_UI_CONTROLLER_TYPE_IMPL(GlicUI)
diff --git a/chrome/browser/glic/host/glic_ui_interactive_uitest.cc b/chrome/browser/glic/host/glic_ui_interactive_uitest.cc index b52c3ba..ab6e0b6 100644 --- a/chrome/browser/glic/host/glic_ui_interactive_uitest.cc +++ b/chrome/browser/glic/host/glic_ui_interactive_uitest.cc
@@ -639,10 +639,16 @@ embedded_https_test_server().GetURL("/echo").ReplaceComponents( replacements); + GURL::Replacements pattern_replacements; + pattern_replacements.SetPathStr("/echo"); + pattern_replacements.SetQueryStr("*"); + std::vector<base::test::FeatureRefAndParams> enabled_features = { {features::kGlicDebugWebview, {}}, {features::kGlicCaaGuestError, - {{"glic-caa-link-url", destination_url_.spec()}}}}; + {{"glic-caa-link-url", destination_url_.spec()}, + {"glic-caa-redirect-patterns", + admin_url.ReplaceComponents(pattern_replacements).spec()}}}}; redirect_features_.InitWithFeaturesAndParameters(enabled_features, /*disabled_features=*/{});
diff --git a/chrome/browser/media/router/discovery/discovery_network_list_win.cc b/chrome/browser/media/router/discovery/discovery_network_list_win.cc index 2d108382..7884958 100644 --- a/chrome/browser/media/router/discovery/discovery_network_list_win.cc +++ b/chrome/browser/media/router/discovery/discovery_network_list_win.cc
@@ -9,6 +9,7 @@ #include "chrome/browser/media/router/discovery/discovery_network_list_win.h" +#include <windows.h> #include <winsock2.h> #include <windot11.h> @@ -22,6 +23,7 @@ #include "base/check.h" #include "base/containers/heap_array.h" +#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" @@ -222,6 +224,8 @@ &wlan_current_version, &wlan_client_handle.handle); if (result != ERROR_SUCCESS) { + ::SetLastError(result); + PLOG(WARNING) << "Failed to open WLAN handle"; return {}; } @@ -229,6 +233,8 @@ result = wlan_api->wlan_enum_interfaces(wlan_client_handle.handle, nullptr, &wlan_interface_list_raw); if (result != ERROR_SUCCESS) { + ::SetLastError(result); + PLOG(WARNING) << "Failed to enumerate WLAN interfaces"; return {}; }
diff --git a/chrome/browser/ntp_customization/BUILD.gn b/chrome/browser/ntp_customization/BUILD.gn index 562612bf..bc960a3 100644 --- a/chrome/browser/ntp_customization/BUILD.gn +++ b/chrome/browser/ntp_customization/BUILD.gn
@@ -40,6 +40,7 @@ "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListThemeCollectionItemIconView.java", "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediator.java", "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeProperty.java", + "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeStateProvider.java", "java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinder.java", "java/src/org/chromium/chrome/browser/ntp_customization/theme/UploadImagePreviewCoordinator.java", "java/src/org/chromium/chrome/browser/ntp_customization/theme/chrome_colors/NtpChromeColorsAdapter.java", @@ -199,6 +200,7 @@ "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListItemViewUnitTest.java", "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeListThemeCollectionItemIconViewUnitTest.java", "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeMediatorUnitTest.java", + "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeStateProviderUnitTest.java", "junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeViewBinderUnitTest.java", "junit/src/org/chromium/chrome/browser/ntp_customization/theme/UploadImagePreviewCoordinatorUnitTest.java", "junit/src/org/chromium/chrome/browser/ntp_customization/theme/chrome_colors/NtpChromeColorsAdapterUnitTest.java",
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediator.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediator.java index dff39e1..1630d5a 100644 --- a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediator.java +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediator.java
@@ -24,12 +24,12 @@ import android.view.View; import android.widget.ViewFlipper; -import org.chromium.base.ContextUtils; import org.chromium.base.ResettersForTesting; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.feed.FeedFeatures; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.ntp_customization.theme.NtpThemeStateProvider; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent; @@ -108,10 +108,10 @@ public void onSheetClosed(@BottomSheetController.StateChangeReason int reason) { mBottomSheetContent.onSheetClosed(); mBottomSheetController.removeObserver(mBottomSheetObserver); - // Recreates the activity if a new customized theme color is selected or - // removed. + // Notify to recreate activities if a new customized theme color is selected + // or removed. if (mShouldRecreate) { - assumeNonNull(ContextUtils.activityFromContext(context)).recreate(); + NtpThemeStateProvider.getInstance().notifyApplyThemeChanges(); } } };
diff --git a/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeStateProvider.java b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeStateProvider.java new file mode 100644 index 0000000..6574c9f3 --- /dev/null +++ b/chrome/browser/ntp_customization/java/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeStateProvider.java
@@ -0,0 +1,74 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import androidx.annotation.Nullable; + +import org.chromium.base.ObserverList; +import org.chromium.base.ResettersForTesting; +import org.chromium.build.annotations.NullMarked; + +/** Manages the NTP's theme state and notifies observers of changes. */ +@NullMarked +public class NtpThemeStateProvider { + /** An interface to get NTP theme state updates. */ + @FunctionalInterface + public interface Observer { + /** Notify observers to apply a new theme. */ + void applyThemeChanges(); + } + + private static @Nullable NtpThemeStateProvider sInstanceForTesting; + + /** Static class that implements the initialization-on-demand holder idiom. */ + private static class LazyHolder { + static final NtpThemeStateProvider sInstance = new NtpThemeStateProvider(); + } + + private final ObserverList<Observer> mObservers; + + /** Returns the singleton instance of NtpThemeStateProvider. */ + public static NtpThemeStateProvider getInstance() { + if (sInstanceForTesting != null) { + return sInstanceForTesting; + } + return NtpThemeStateProvider.LazyHolder.sInstance; + } + + private NtpThemeStateProvider() { + mObservers = new ObserverList<>(); + } + + /** Adds an {@link Observer} to receive updates when the NTP theme state changes. */ + public void addObserver(Observer observer) { + mObservers.addObserver(observer); + } + + /** + * Removes the given observer from the observer list. + * + * @param observer The observer to remove. + */ + public void removeObserver(Observer observer) { + mObservers.removeObserver(observer); + } + + /** Notifies observers to apply a new theme. */ + public void notifyApplyThemeChanges() { + for (Observer observer : mObservers) { + observer.applyThemeChanges(); + } + } + + /** + * Sets a NtpThemeStateProvider instance for testing. + * + * @param instance The instance to set. + */ + public static void setInstanceForTesting(@Nullable NtpThemeStateProvider instance) { + sInstanceForTesting = instance; + ResettersForTesting.register(() -> sInstanceForTesting = null); + } +}
diff --git a/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediatorUnitTest.java b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediatorUnitTest.java index 3c9e533..af5db96 100644 --- a/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediatorUnitTest.java +++ b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/NtpCustomizationMediatorUnitTest.java
@@ -53,6 +53,7 @@ import org.chromium.chrome.browser.feed.FeedServiceBridgeJni; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.ntp_customization.NtpCustomizationCoordinator.BottomSheetType; +import org.chromium.chrome.browser.ntp_customization.theme.NtpThemeStateProvider; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent; @@ -287,6 +288,29 @@ observer.onSheetClosed(0); // Closes the sheet by clicking the system back button. verify(mBottomSheetContent).onSheetClosed(); verify(mBottomSheetController).removeObserver(eq(observer)); + + NtpThemeStateProvider.setInstanceForTesting(null); + } + + @Test + public void testBottomSheetObserver_notifyApplyThemeChanges() { + BottomSheetObserver observer = mMediator.getBottomSheetObserverForTesting(); + NtpThemeStateProvider ntpThemeStateProvider = mock(NtpThemeStateProvider.class); + NtpThemeStateProvider.setInstanceForTesting(ntpThemeStateProvider); + + // Verifies notifyApplyThemeChanges() is called when a different theme color is selected. + mMediator.onNewColorSelected(/* isDifferentColor= */ true); + observer.onSheetClosed(2); + verify(ntpThemeStateProvider).notifyApplyThemeChanges(); + + clearInvocations(ntpThemeStateProvider); + + // Verifies notifyApplyThemeChanges() is NOT called when theme color isn't changed. + mMediator.onNewColorSelected(/* isDifferentColor= */ false); + observer.onSheetClosed(2); + verify(ntpThemeStateProvider, never()).notifyApplyThemeChanges(); + + NtpThemeStateProvider.setInstanceForTesting(null); } @Test
diff --git a/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeStateProviderUnitTest.java b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeStateProviderUnitTest.java new file mode 100644 index 0000000..7725e8b --- /dev/null +++ b/chrome/browser/ntp_customization/junit/src/org/chromium/chrome/browser/ntp_customization/theme/NtpThemeStateProviderUnitTest.java
@@ -0,0 +1,55 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.ntp_customization.theme; + +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.robolectric.annotation.Config; + +import org.chromium.base.test.BaseRobolectricTestRunner; + +/** Tests for {@link NtpThemeStateProvider}. */ +@RunWith(BaseRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class NtpThemeStateProviderUnitTest { + @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Mock private NtpThemeStateProvider.Observer mObserver; + + private NtpThemeStateProvider mNtpThemeStateProvider; + + @Before + public void setUp() { + mNtpThemeStateProvider = NtpThemeStateProvider.getInstance(); + NtpThemeStateProvider.setInstanceForTesting(mNtpThemeStateProvider); + } + + @After + public void tearDown() { + NtpThemeStateProvider.setInstanceForTesting(null); + } + + @Test + public void testAddRemoveObserver() { + mNtpThemeStateProvider.addObserver(mObserver); + mNtpThemeStateProvider.notifyApplyThemeChanges(); + verify(mObserver).applyThemeChanges(); + + clearInvocations(mObserver); + mNtpThemeStateProvider.removeObserver(mObserver); + mNtpThemeStateProvider.notifyApplyThemeChanges(); + verify(mObserver, never()).applyThemeChanges(); + } +}
diff --git a/chrome/browser/profiles/profile_attributes_storage_unittest.cc b/chrome/browser/profiles/profile_attributes_storage_unittest.cc index db006fe..9497b43 100644 --- a/chrome/browser/profiles/profile_attributes_storage_unittest.cc +++ b/chrome/browser/profiles/profile_attributes_storage_unittest.cc
@@ -49,6 +49,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_unittest_util.h" #if !BUILDFLAG(IS_ANDROID)
diff --git a/chrome/browser/profiles/profile_avatar_icon_util.h b/chrome/browser/profiles/profile_avatar_icon_util.h index 2d56c08f..c4b21d89 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.h +++ b/chrome/browser/profiles/profile_avatar_icon_util.h
@@ -18,7 +18,6 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/base/models/image_model.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/image/image_skia.h" namespace base { class FilePath; @@ -26,6 +25,7 @@ namespace gfx { class Image; +class ImageSkia; } class Profile;
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc index 3d8f1456..8f8ac15 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
@@ -2721,8 +2721,17 @@ })); } +// This test is flaky on the linux-chromeos-chrome bot. +// TODO(crbug.com/445698141): Enable the test on ChromeOS bots. +#if BUILDFLAG(IS_CHROMEOS) +#define MAYBE_SearchForTextContextMenuOpensLensOverlay \ + DISABLED_SearchForTextContextMenuOpensLensOverlay +#else +#define MAYBE_SearchForTextContextMenuOpensLensOverlay \ + SearchForTextContextMenuOpensLensOverlay +#endif IN_PROC_BROWSER_TEST_F(LensOverlayBrowserTest, - SearchForTextContextMenuOpensLensOverlay) { + MAYBE_SearchForTextContextMenuOpensLensOverlay) { GURL page("data:text/html,text"); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), page));
diff --git a/chrome/browser/resources/glic/webview.ts b/chrome/browser/resources/glic/webview.ts index e0b91c2..a9473de 100644 --- a/chrome/browser/resources/glic/webview.ts +++ b/chrome/browser/resources/glic/webview.ts
@@ -358,12 +358,14 @@ } private urlMatchesAdminBlockedUrl(url: string) { - const adminBlockedRedirectOrigins = - loadTimeData.getString('adminBlockedRedirectOrigins'); - if (adminBlockedRedirectOrigins && - adminBlockedRedirectOrigins.split(' ').some( - origin => matcherForOrigin(origin.trim())?.test(url))) { - console.warn(`CAA error page detected.`); + const adminBlockedRedirectPatterns = + loadTimeData.getString('adminBlockedRedirectPatterns'); + if (!adminBlockedRedirectPatterns) { + return false; + } + if (adminBlockedRedirectPatterns.split(' ').some( + pattern => new URLPattern(pattern.trim()).test(url))) { + console.warn(`Admin blocked error page detected.`); return true; } return false;
diff --git a/chrome/browser/resources/settings/autofill_page/autofill_page.ts b/chrome/browser/resources/settings/autofill_page/autofill_page.ts index 00dcfb4..b311867 100644 --- a/chrome/browser/resources/settings/autofill_page/autofill_page.ts +++ b/chrome/browser/resources/settings/autofill_page/autofill_page.ts
@@ -27,6 +27,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {loadTimeData} from '../i18n_setup.js'; +import {AutofillSettingsReferrer, type MetricsBrowserProxy, MetricsBrowserProxyImpl} from '../metrics_browser_proxy.js'; import {routes} from '../route.js'; import {Router} from '../router.js'; import {SettingsViewMixin} from '../settings_page/settings_view_mixin.js'; @@ -65,11 +66,16 @@ } declare private autofillAiAvailable_: boolean; + private metricsBrowserProxy_: MetricsBrowserProxy = + MetricsBrowserProxyImpl.getInstance(); /** * Shows the manage addresses sub page. */ private onAddressesClick_() { + this.metricsBrowserProxy_.recordAutofillSettingsReferrer( + 'Autofill.AddressesSettingsPage.VisitReferrer', + AutofillSettingsReferrer.AUTOFILL_AND_PASSWORDS_PAGE); Router.getInstance().navigateTo(routes.ADDRESSES); } @@ -77,6 +83,9 @@ * Shows the manage payment methods sub page. */ private onPaymentsClick_() { + this.metricsBrowserProxy_.recordAutofillSettingsReferrer( + 'Autofill.PaymentMethodsSettingsPage.VisitReferrer', + AutofillSettingsReferrer.AUTOFILL_AND_PASSWORDS_PAGE); Router.getInstance().navigateTo(routes.PAYMENTS); } @@ -93,6 +102,9 @@ * Shows the Autofill AI settings sub page. */ private onAutofillAiClick_() { + this.metricsBrowserProxy_.recordAutofillSettingsReferrer( + 'Autofill.FormsAiSettingsPage.VisitReferrer', + AutofillSettingsReferrer.AUTOFILL_AND_PASSWORDS_PAGE); Router.getInstance().navigateTo(routes.AUTOFILL_AI); }
diff --git a/chrome/browser/resources/settings/metrics_browser_proxy.ts b/chrome/browser/resources/settings/metrics_browser_proxy.ts index 18035f7..f4038169 100644 --- a/chrome/browser/resources/settings/metrics_browser_proxy.ts +++ b/chrome/browser/resources/settings/metrics_browser_proxy.ts
@@ -411,6 +411,23 @@ } // LINT.ThenChange(/tools/metrics/histograms/metadata/settings/enums.xml:SettingsAiPageTabOrganizationInteractions) +/** + * These values are persisted to logs. Entries should not be renumbered and + * numeric values should never be reused. + * + * Must be kept in sync with the AutofillSettingsReferrer enum in + * histograms/metadata/autofill/enums.xml + */ +// LINT.IfChange(AutofillSettingsReferrer) +export enum AutofillSettingsReferrer { + // PROFILE_MENU = 0, + SETTINGS_MENU = 1, + AUTOFILL_AND_PASSWORDS_PAGE = 2, + // FILLING_FLOW_DROPDOWN = 3, + MAX_VALUE = 4, +} +// LINT.ThenChange(/tools/metrics/histograms/metadata/autofill/enums.xml:AutofillSettingsReferrer) + export interface MetricsBrowserProxy { /** * Helper function that calls recordAction with one action from @@ -597,6 +614,12 @@ */ recordAiPageTabOrganizationInteractions( interaction: AiPageTabOrganizationInteractions): void; + + /** + * Records a referrer to one of Autofill settings pages. + */ + recordAutofillSettingsReferrer( + histogramName: string, referrer: AutofillSettingsReferrer): void; } export class MetricsBrowserProxyImpl implements MetricsBrowserProxy { @@ -829,6 +852,13 @@ ]); } + recordAutofillSettingsReferrer( + histogramName: string, referrer: AutofillSettingsReferrer) { + chrome.send( + 'metricsHandler:recordInHistogram', + [histogramName, referrer, AutofillSettingsReferrer.MAX_VALUE]); + } + static getInstance(): MetricsBrowserProxy { return instance || (instance = new MetricsBrowserProxyImpl()); }
diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts index 063a68c..17dbdd28 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts
@@ -72,7 +72,7 @@ // <if expr="not is_chromeos"> export {convertLanguageCodeForChrome, convertLanguageCodeForTranslate, getBaseLanguage, isTranslateBaseLanguage} from './languages_page/languages_util.js'; // </if> -export {AiPageCompareInteractions, AiPageComposeInteractions, AiPageHistorySearchInteractions, AiPageInteractions, AiPageTabOrganizationInteractions, CardBenefitsUserAction, CvcDeletionUserAction, DeleteBrowsingDataAction, MetricsBrowserProxy, MetricsBrowserProxyImpl, PrivacyElementInteractions, PrivacyGuideInteractions, PrivacyGuideSettingsStates, PrivacyGuideStepsEligibleAndReached, SafeBrowsingInteractions, SafetyCheckNotificationsModuleInteractions, SafetyCheckUnusedSitePermissionsModuleInteractions, SafetyHubCardState, SafetyHubEntryPoint, SafetyHubModuleType, SafetyHubSurfaces} from './metrics_browser_proxy.js'; +export {AiPageCompareInteractions, AiPageComposeInteractions, AiPageHistorySearchInteractions, AiPageInteractions, AiPageTabOrganizationInteractions, AutofillSettingsReferrer, CardBenefitsUserAction, CvcDeletionUserAction, DeleteBrowsingDataAction, MetricsBrowserProxy, MetricsBrowserProxyImpl, PrivacyElementInteractions, PrivacyGuideInteractions, PrivacyGuideSettingsStates, PrivacyGuideStepsEligibleAndReached, SafeBrowsingInteractions, SafetyCheckNotificationsModuleInteractions, SafetyCheckUnusedSitePermissionsModuleInteractions, SafetyHubCardState, SafetyHubEntryPoint, SafetyHubModuleType, SafetyHubSurfaces} from './metrics_browser_proxy.js'; export {NtpExtension, OnStartupBrowserProxy, OnStartupBrowserProxyImpl} from './on_startup_page/on_startup_browser_proxy.js'; export {SettingsOnStartupPageElement} from './on_startup_page/on_startup_page.js'; export {SettingsStartupUrlDialogElement} from './on_startup_page/startup_url_dialog.js';
diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html index d2c1b4c..90780ae 100644 --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
@@ -70,6 +70,7 @@ hidden="[[!showAutofillPageMenuItem_( enableYourSavedInfoSettingsPage_, pageVisibility_.autofill)]]" + on-click="onAutofillClick_" class="cr-nav-menu-item"> <cr-icon icon="settings:assignment"></cr-icon> $i18n{autofillPageTitle}
diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.ts b/chrome/browser/resources/settings/settings_menu/settings_menu.ts index 5f362af3..3d58313 100644 --- a/chrome/browser/resources/settings/settings_menu/settings_menu.ts +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.ts
@@ -27,7 +27,7 @@ import {loadTimeData} from '../i18n_setup.js'; import type {MetricsBrowserProxy} from '../metrics_browser_proxy.js'; -import {MetricsBrowserProxyImpl} from '../metrics_browser_proxy.js'; +import {AutofillSettingsReferrer, MetricsBrowserProxyImpl} from '../metrics_browser_proxy.js'; import {pageVisibility} from '../page_visibility.js'; import type {PageVisibility} from '../page_visibility.js'; import type {Route} from '../router.js'; @@ -159,6 +159,12 @@ 'SettingsMenu_ExtensionsLinkClicked'); } + private onAutofillClick_() { + this.metricsBrowserProxy_.recordAutofillSettingsReferrer( + 'Autofill.AutofillAndPasswordsSettingsPage.VisitReferrer', + AutofillSettingsReferrer.SETTINGS_MENU); + } + private onAiPageClick_() { this.metricsBrowserProxy_.recordAction( 'SettingsMenu_AiPageEntryPointClicked');
diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java index 22d8d46..97e18b1 100644 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java
@@ -40,7 +40,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.function.Supplier; @@ -296,9 +295,9 @@ } private void maybeAddSendTabToSelfFirstPartyOption() { - Optional<Integer> sendTabToSelfDisplayReason = + Integer sendTabToSelfDisplayReason = SendTabToSelfAndroidBridge.getEntryPointDisplayReason(mProfile, mUrl); - if (sendTabToSelfDisplayReason.isPresent()) { + if (sendTabToSelfDisplayReason != null) { mOrderedFirstPartyOptions.add(createSendTabToSelfFirstPartyOption()); } }
diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfAndroidBridge.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfAndroidBridge.java index 06b93ac..9c30d99 100644 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfAndroidBridge.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfAndroidBridge.java
@@ -14,7 +14,6 @@ import org.chromium.content_public.browser.WebContents; import java.util.List; -import java.util.Optional; /** * Bridge to interface with send_tab_to_self_android_bridge which interacts with the corresponding @@ -81,11 +80,9 @@ SendTabToSelfAndroidBridgeJni.get().updateActiveWebContents(webContents); } - public static Optional</*@EntryPointDisplayReason*/ Integer> getEntryPointDisplayReason( + public static @Nullable @EntryPointDisplayReason Integer getEntryPointDisplayReason( Profile profile, String url) { - Integer reason = - SendTabToSelfAndroidBridgeJni.get().getEntryPointDisplayReason(profile, url); - return reason == null ? Optional.empty() : Optional.of(reason.intValue()); + return SendTabToSelfAndroidBridgeJni.get().getEntryPointDisplayReason(profile, url); } @NativeMethods
diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java index 362806c..bb9d8cca 100644 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
@@ -28,7 +28,6 @@ import org.chromium.ui.base.WindowAndroid; import java.util.List; -import java.util.Optional; /** Coordinator for displaying the send tab to self feature. */ @NullMarked @@ -83,12 +82,13 @@ } private void notifyAndDestroyIfDone() { - Optional</*@EntryPointDisplayReason*/ Integer> displayReason = + @EntryPointDisplayReason + Integer displayReason = SendTabToSelfAndroidBridge.getEntryPointDisplayReason(mProfile, mUrl); // The model is starting up, keep waiting. - if (!displayReason.isPresent()) return; + if (displayReason == null) return; - switch (displayReason.get()) { + switch (displayReason) { case EntryPointDisplayReason.OFFER_SIGN_IN: return; case EntryPointDisplayReason.INFORM_NO_TARGET_DEVICE: @@ -164,12 +164,13 @@ } public void show() { - Optional</*@EntryPointDisplayReason*/ Integer> displayReason = + @EntryPointDisplayReason + Integer displayReason = SendTabToSelfAndroidBridge.getEntryPointDisplayReason(mProfile, mUrl); - assert displayReason.isPresent(); + assert displayReason != null; MetricsRecorder.recordCrossDeviceTabJourney(); - switch (displayReason.get()) { + switch (displayReason) { case EntryPointDisplayReason.INFORM_NO_TARGET_DEVICE: mController.requestShowContent( new NoTargetDeviceBottomSheetContent(mContext, mProfile), true);
diff --git a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinatorTest.java b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinatorTest.java index bab424f..9b7a26ae 100644 --- a/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinatorTest.java +++ b/chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinatorTest.java
@@ -38,8 +38,6 @@ import org.chromium.components.browser_ui.device_lock.DeviceLockActivityLauncher; import org.chromium.ui.base.WindowAndroid; -import java.util.Optional; - /** Tests for SendTabToSelfCoordinator */ @RunWith(ChromeJUnit4ClassRunner.class) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) @@ -76,11 +74,11 @@ // Sign in and wait for the device list to be downloaded. mSyncTestRule.setUpAccountAndSignInForTesting(); CriteriaHelper.pollUiThread( - () -> { - return SendTabToSelfAndroidBridge.getEntryPointDisplayReason( - ProfileManager.getLastUsedRegularProfile(), HTTP_URL.getSpec()) - .equals(Optional.of(EntryPointDisplayReason.OFFER_FEATURE)); - }); + () -> + SendTabToSelfAndroidBridge.getEntryPointDisplayReason( + ProfileManager.getLastUsedRegularProfile(), + HTTP_URL.getSpec()) + .equals(EntryPointDisplayReason.OFFER_FEATURE)); buildAndShowCoordinator();
diff --git a/chrome/browser/ssl/known_interception_disclosure_infobar.cc b/chrome/browser/ssl/known_interception_disclosure_infobar.cc index f6d97ee..5f421d2 100644 --- a/chrome/browser/ssl/known_interception_disclosure_infobar.cc +++ b/chrome/browser/ssl/known_interception_disclosure_infobar.cc
@@ -14,6 +14,7 @@ #include "ui/base/models/image_model.h" #include "ui/gfx/android/java_bitmap.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/image/image_skia.h" // Must come after all headers that specialize FromJniType() / ToJniType(). #include "chrome/android/chrome_jni_headers/KnownInterceptionDisclosureInfoBar_jni.h"
diff --git a/chrome/browser/status_icons/status_icon.cc b/chrome/browser/status_icons/status_icon.cc index 4c90ff8..0c059e2 100644 --- a/chrome/browser/status_icons/status_icon.cc +++ b/chrome/browser/status_icons/status_icon.cc
@@ -9,6 +9,7 @@ #include "base/observer_list.h" #include "build/build_config.h" #include "chrome/browser/status_icons/status_icon_observer.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/paint_vector_icon.h" StatusIcon::StatusIcon() = default;
diff --git a/chrome/browser/supervised_user/extension_icon_loader_unittest.cc b/chrome/browser/supervised_user/extension_icon_loader_browsertest.cc similarity index 62% rename from chrome/browser/supervised_user/extension_icon_loader_unittest.cc rename to chrome/browser/supervised_user/extension_icon_loader_browsertest.cc index 0dfc4a0..81492b5 100644 --- a/chrome/browser/supervised_user/extension_icon_loader_unittest.cc +++ b/chrome/browser/supervised_user/extension_icon_loader_browsertest.cc
@@ -6,41 +6,25 @@ #include <memory> -#include "base/command_line.h" -#include "base/files/file_path.h" #include "base/functional/bind.h" -#include "base/json/json_file_value_serializer.h" -#include "base/memory/raw_ptr.h" -#include "base/path_service.h" #include "base/run_loop.h" -#include "base/values.h" -#include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/common/chrome_paths.h" -#include "chrome/test/base/browser_with_test_window_test.h" +#include "chrome/browser/extensions/extension_browsertest.h" +#include "chrome/browser/profiles/profile.h" +#include "content/public/test/browser_test.h" #include "extensions/browser/extension_registrar.h" #include "extensions/browser/extension_util.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" -#include "extensions/common/manifest.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/image/image_skia.h" -class ExtensionIconLoaderTest : public BrowserWithTestWindowTest { +class ExtensionIconLoaderTest : public extensions::ExtensionBrowserTest { public: ExtensionIconLoaderTest() = default; ExtensionIconLoaderTest(const ExtensionIconLoaderTest&) = delete; ExtensionIconLoaderTest& operator=(const ExtensionIconLoaderTest&) = delete; ~ExtensionIconLoaderTest() override = default; - void SetUp() override { - BrowserWithTestWindowTest::SetUp(); - extensions::TestExtensionSystem* extension_system = - static_cast<extensions::TestExtensionSystem*>( - extensions::ExtensionSystem::Get(profile())); - extension_system->CreateExtensionService( - base::CommandLine::ForCurrentProcess(), base::FilePath(), false); - } - void OnIconFetched(base::RunLoop* run_loop, const gfx::ImageSkia& icon) { run_loop->Quit(); loaded_icon_ = icon; @@ -48,30 +32,15 @@ const gfx::ImageSkia& loaded_icon() { return loaded_icon_; } - extensions::ExtensionRegistrar* extension_registrar() { - return extensions::ExtensionRegistrar::Get(profile()); - } - protected: gfx::ImageSkia loaded_icon_; }; -TEST_F(ExtensionIconLoaderTest, LoadExtensionWithIcon) { +IN_PROC_BROWSER_TEST_F(ExtensionIconLoaderTest, LoadExtensionWithIcon) { // Create and add an extension from a test manifest with an icon. - base::FilePath test_file; - ASSERT_TRUE(base::PathService::Get(chrome::DIR_TEST_DATA, &test_file)); - test_file = test_file.AppendASCII("extensions/simple_with_icon"); - int error_code = 0; - std::string error; - JSONFileValueDeserializer deserializer( - test_file.AppendASCII("manifest.json")); - std::unique_ptr<base::Value> valid_value = - deserializer.Deserialize(&error_code, &error); - scoped_refptr<extensions::Extension> extension = - extensions::Extension::Create( - test_file, extensions::mojom::ManifestLocation::kUnpacked, - valid_value->GetDict(), extensions::Extension::NO_FLAGS, &error); - extension_registrar()->AddExtension(extension); + const extensions::Extension* extension = + LoadExtension(test_data_dir_.AppendASCII("simple_with_icon")); + ASSERT_TRUE(extension); extensions::ExtensionIconLoader loader; @@ -89,7 +58,7 @@ extensions::util::GetDefaultAppIcon().bitmap()); } -TEST_F(ExtensionIconLoaderTest, LoadDefaultAppIcon) { +IN_PROC_BROWSER_TEST_F(ExtensionIconLoaderTest, LoadDefaultAppIcon) { // Create an app with no icon. scoped_refptr<const extensions::Extension> extension = extensions::ExtensionBuilder( @@ -110,7 +79,7 @@ extensions::util::GetDefaultAppIcon().bitmap()); } -TEST_F(ExtensionIconLoaderTest, LoadDefaultExtensionIcon) { +IN_PROC_BROWSER_TEST_F(ExtensionIconLoaderTest, LoadDefaultExtensionIcon) { // Create an extension with no icon. scoped_refptr<const extensions::Extension> extension = extensions::ExtensionBuilder("extension").Build();
diff --git a/chrome/browser/sync/test/integration/apps_helper.cc b/chrome/browser/sync/test/integration/apps_helper.cc index 41cda22..856a9bd 100644 --- a/chrome/browser/sync/test/integration/apps_helper.cc +++ b/chrome/browser/sync/test/integration/apps_helper.cc
@@ -14,6 +14,7 @@ #include "base/test/bind.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" +#include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_app_helper.h" @@ -290,7 +291,7 @@ prefs->AddObserver(this); install_tracker_observation_.AddObservation( - extensions::InstallTracker::Get(profile)); + extensions::InstallTrackerFactory::GetForBrowserContext(profile)); } }
diff --git a/chrome/browser/sync/test/integration/apps_helper.h b/chrome/browser/sync/test/integration/apps_helper.h index c23af9f..2cbfcd3 100644 --- a/chrome/browser/sync/test/integration/apps_helper.h +++ b/chrome/browser/sync/test/integration/apps_helper.h
@@ -12,8 +12,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h" -#include "chrome/browser/extensions/install_observer.h" -#include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/sync/test/integration/status_change_checker.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/web_applications/web_app_install_info.h" @@ -21,6 +19,8 @@ #include "components/webapps/common/web_app_id.h" #include "extensions/browser/extension_prefs_observer.h" #include "extensions/browser/extension_registry_observer.h" +#include "extensions/browser/install_observer.h" +#include "extensions/browser/install_tracker.h" class Profile;
diff --git a/chrome/browser/tab/protocol/BUILD.gn b/chrome/browser/tab/protocol/BUILD.gn index d635269..07720bf 100644 --- a/chrome/browser/tab/protocol/BUILD.gn +++ b/chrome/browser/tab/protocol/BUILD.gn
@@ -7,16 +7,10 @@ proto_library("protocol") { proto_in_dir = "//" - sources = [ - "children.proto", - "tab_state.proto", - ] + sources = [ "tab_state.proto" ] } proto_java_library("proto_java") { proto_path = "//" - sources = [ - "children.proto", - "tab_state.proto", - ] + sources = [ "tab_state.proto" ] }
diff --git a/chrome/browser/tab/protocol/children.proto b/chrome/browser/tab/protocol/children.proto deleted file mode 100644 index be281d8e..0000000 --- a/chrome/browser/tab/protocol/children.proto +++ /dev/null
@@ -1,18 +0,0 @@ -// Copyright 2025 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -syntax = "proto2"; -option optimize_for = LITE_RUNTIME; - -package tabs_pb; -option java_package = "org.chromium.chrome.browser.tabs.proto"; - -message Children { - // Used to serialize a list of ids into a single db blob cell. The storage id - // is created by the storage system and used to map in memory objects to rows - // in the database. Note that before this system is authoratative for reads, - // this mapping cannot be recreated on start up, and will require rebuilding - // (and deletion of the whole db) to fix. - repeated int32 storage_id = 1; -}
diff --git a/chrome/browser/tab/tab_state_storage_service.cc b/chrome/browser/tab/tab_state_storage_service.cc index 8c935819..0954f611 100644 --- a/chrome/browser/tab/tab_state_storage_service.cc +++ b/chrome/browser/tab/tab_state_storage_service.cc
@@ -5,35 +5,9 @@ #include "chrome/browser/tab/tab_state_storage_service.h" #include "base/token.h" -#include "chrome/browser/tab/protocol/children.pb.h" -#include "components/tabs/public/direct_child_walker.h" -#include "components/tabs/public/tab_collection.h" -#include "components/tabs/public/tab_interface.h" namespace tabs { -class TabStateStorageService::SaveProcessor - : public DirectChildWalker::Processor { - public: - SaveProcessor(TabStateStorageService* service, - tabs_pb::Children* children_proto) - : service_(service), children_proto_(children_proto) {} - - void ProcessTab(const TabInterface* tab) override { - children_proto_->add_storage_id(service_->GetOrCreateStorageId( - tab, service_->tab_handle_to_storage_id_)); - } - - void ProcessCollection(const TabCollection* collection) override { - children_proto_->add_storage_id(service_->GetOrCreateStorageId( - collection, service_->collection_handle_to_storage_id_)); - } - - private: - raw_ptr<TabStateStorageService> service_; - raw_ptr<tabs_pb::Children> children_proto_; -}; - TabStateStorageService::TabStateStorageService( std::unique_ptr<TabStateStorageBackend> tab_backend) : tab_backend_(std::move(tab_backend)) { @@ -83,11 +57,6 @@ tab_state.set_is_pinned(is_pinned); std::string payload; tab_state.SerializeToString(&payload); - // TODO(https://crbug.com/427254267): Using Java Tab id for storage id is now - // a completely invalid approach and will conflict with storage ids generated - // for the collections objects. This method needs to be reworked to take a - // collections object instead. - // TODO(https://crbug.com/427254267): Create enum for types. tab_backend_->SaveNode(id, 1, std::move(payload), ""); } @@ -99,13 +68,8 @@ void TabStateStorageService::OnAllTabsLoaded(LoadAllTabsCallback callback, std::vector<NodeState> entries) { - int max_id = 0; std::vector<tabs_pb::TabState> tab_states; for (auto& entry : entries) { - if (entry.id > max_id) { - max_id = entry.id; - } - // TODO(https://crbug.com/427254267): Create enum for types. if (entry.type == 1) { tabs_pb::TabState tab_state; if (tab_state.ParseFromString(entry.payload)) { @@ -113,40 +77,7 @@ } } } - // TODO(https://crbug.com/427254267): While this avoids collisions and does - // set up a mapping for live Tab objects from Java, doesn't interact nicely - // with collections objects mappings. Ideally this will be fully replaced as - // soon as we can create and pass up collections objects on start up. - next_storage_id_ = max_id + 1; std::move(callback).Run(std::move(tab_states)); } -void TabStateStorageService::Save(const tabs::TabCollection* tab_collection) { - tabs_pb::Children children_proto; - SaveProcessor processor(this, &children_proto); - DirectChildWalker walker(tab_collection, &processor); - walker.Walk(); - - int storage_id = - GetOrCreateStorageId(tab_collection, collection_handle_to_storage_id_); - std::string children_string; - children_proto.SerializeToString(&children_string); - // TODO(https://crbug.com/427254267): Write payload for metadata about - // collections object once extractor mechaism exists. - // TODO(https://crbug.com/427254267): Create enum for types. - tab_backend_->SaveNode(storage_id, 2, "", std::move(children_string)); -} - -template <typename T> -int TabStateStorageService::GetOrCreateStorageId( - T* object, - std::map<int32_t, int>& handle_map) { - int32_t handle_id = object->GetHandle().raw_value(); - auto [it, inserted] = handle_map.try_emplace(handle_id, next_storage_id_); - if (inserted) { - next_storage_id_++; - } - return it->second; -} - } // namespace tabs
diff --git a/chrome/browser/tab/tab_state_storage_service.h b/chrome/browser/tab/tab_state_storage_service.h index 20dbf09..7a73939 100644 --- a/chrome/browser/tab/tab_state_storage_service.h +++ b/chrome/browser/tab/tab_state_storage_service.h
@@ -18,10 +18,6 @@ #include "components/keyed_service/core/keyed_service.h" namespace tabs { -class TabCollection; -} // namespace tabs - -namespace tabs { class TabStateStorageService : public KeyedService, public base::SupportsUserData { @@ -48,8 +44,6 @@ bool tab_has_sensitive_content, bool is_pinned); - void Save(const tabs::TabCollection* tab_collection); - void LoadAllTabs(LoadAllTabsCallback callback); // Returns a Java object of the type TabStateStorageService. This is @@ -58,17 +52,9 @@ TabStateStorageService* tab_state_storage_service); private: - class SaveProcessor; - - template <typename T> - int GetOrCreateStorageId(T* object, std::map<int32_t, int>& handle_map); - void OnAllTabsLoaded(LoadAllTabsCallback callback, std::vector<NodeState> entries); std::unique_ptr<TabStateStorageBackend> tab_backend_; - int next_storage_id_ = 1; - std::map<int32_t, int> tab_handle_to_storage_id_; - std::map<int32_t, int> collection_handle_to_storage_id_; }; } // namespace tabs
diff --git a/chrome/browser/ui/android/autofill/autofill_vcn_enroll_bottom_sheet_bridge.cc b/chrome/browser/ui/android/autofill/autofill_vcn_enroll_bottom_sheet_bridge.cc index 8ee2d7ed..aa5951f6 100644 --- a/chrome/browser/ui/android/autofill/autofill_vcn_enroll_bottom_sheet_bridge.cc +++ b/chrome/browser/ui/android/autofill/autofill_vcn_enroll_bottom_sheet_bridge.cc
@@ -18,6 +18,7 @@ #include "content/public/browser/web_contents.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/android/java_bitmap.h" +#include "ui/gfx/image/image_skia.h" #include "url/android/gurl_android.h" // Must come after all headers that specialize FromJniType() / ToJniType().
diff --git a/chrome/browser/ui/android/extensions/extension_install_dialog_view_android.cc b/chrome/browser/ui/android/extensions/extension_install_dialog_view_android.cc index cd22a0f6..20eebd2 100644 --- a/chrome/browser/ui/android/extensions/extension_install_dialog_view_android.cc +++ b/chrome/browser/ui/android/extensions/extension_install_dialog_view_android.cc
@@ -13,6 +13,7 @@ #include "content/public/browser/web_contents.h" #include "ui/android/view_android.h" #include "ui/android/window_android.h" +#include "ui/gfx/android/java_bitmap.h" // Must come after all headers that specialize FromJniType() / ToJniType(). #include "chrome/browser/ui/android/extensions/jni_headers/ExtensionInstallDialogBridge_jni.h" @@ -73,6 +74,8 @@ Java_ExtensionInstallDialogBridge_showDialog( env, java_object, + ConvertUTF16ToJavaString(env, prompt_->GetDialogTitle()), + gfx::ConvertToJavaBitmap(prompt_->icon().AsBitmap()), ConvertUTF16ToJavaString(env, prompt_->GetAcceptButtonLabel()), ConvertUTF16ToJavaString(env, prompt_->GetAbortButtonLabel())); }
diff --git a/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionInstallDialogBridge.java b/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionInstallDialogBridge.java index 8c0cbe8..bdfa24e2 100644 --- a/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionInstallDialogBridge.java +++ b/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/browser/ui/extensions/ExtensionInstallDialogBridge.java
@@ -7,6 +7,9 @@ import static org.chromium.build.NullUtil.assumeNonNull; import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; @@ -105,13 +108,17 @@ * @param cancelButtonLabel Label for the negative button which acts as the cancel button. */ @CalledByNative - public void showDialog(String acceptButtonLabel, String cancelButtonLabel) { + public void showDialog( + String title, Bitmap iconBitmap, String acceptButtonLabel, String cancelButtonLabel) { View extensionInstallDialogContentView = LayoutInflater.from(mContext).inflate(R.layout.extension_install_dialog, null); + Drawable iconDrawable = new BitmapDrawable(mContext.getResources(), iconBitmap); PropertyModel.Builder builder = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS) .with(ModalDialogProperties.CONTROLLER, mModalDialogController) + .with(ModalDialogProperties.TITLE, title) + .with(ModalDialogProperties.TITLE_ICON, iconDrawable) .with(ModalDialogProperties.CUSTOM_VIEW, extensionInstallDialogContentView) .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, acceptButtonLabel) .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, cancelButtonLabel);
diff --git a/chrome/browser/ui/android/extensions/javatests/src/org/chromium/chrome/browser/ui/extensions/ExtensionInstallDialogBridgeTest.java b/chrome/browser/ui/android/extensions/javatests/src/org/chromium/chrome/browser/ui/extensions/ExtensionInstallDialogBridgeTest.java index a81232d..47d9c08 100644 --- a/chrome/browser/ui/android/extensions/javatests/src/org/chromium/chrome/browser/ui/extensions/ExtensionInstallDialogBridgeTest.java +++ b/chrome/browser/ui/android/extensions/javatests/src/org/chromium/chrome/browser/ui/extensions/ExtensionInstallDialogBridgeTest.java
@@ -9,6 +9,7 @@ import static org.mockito.Mockito.verify; import android.content.res.Resources; +import android.graphics.Bitmap; import androidx.test.core.app.ApplicationProvider; import androidx.test.filters.SmallTest; @@ -34,9 +35,11 @@ public class ExtensionInstallDialogBridgeTest { @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); + private static final String TITLE = "Add 'extension name'?"; private static final String ACCEPT_BUTTON_LABEL = "Add extension"; private static final String CANCEL_BUTTON_LABEL = "Cancel"; private static final long NATIVE_INSTALL_EXTENSION_DIALOG_VIEW = 100L; + private static final Bitmap ICON = Bitmap.createBitmap(24, 24, Bitmap.Config.ARGB_8888); @Mock private Natives mNativeMock; @@ -45,7 +48,8 @@ private ExtensionInstallDialogBridge mExtensionInstallDialogBridge; private void showExtensionInstallDialog() { - mExtensionInstallDialogBridge.showDialog(ACCEPT_BUTTON_LABEL, CANCEL_BUTTON_LABEL); + mExtensionInstallDialogBridge.showDialog( + TITLE, ICON, ACCEPT_BUTTON_LABEL, CANCEL_BUTTON_LABEL); } @Before
diff --git a/chrome/browser/ui/ash/quick_answers/quick_answers_browsertest.cc b/chrome/browser/ui/ash/quick_answers/quick_answers_browsertest.cc index a3c2d1e..fb8b631 100644 --- a/chrome/browser/ui/ash/quick_answers/quick_answers_browsertest.cc +++ b/chrome/browser/ui/ash/quick_answers/quick_answers_browsertest.cc
@@ -4,6 +4,7 @@ #include <string> +#include "ash/constants/ash_pref_names.h" #include "ash/shell.h" #include "ash/system/notification_center/ash_message_popup_collection.h" #include "base/functional/bind.h" @@ -29,6 +30,7 @@ #include "chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h" #include "chrome/browser/ui/ash/quick_answers/quick_answers_ui_controller.h" #include "chrome/browser/ui/ash/quick_answers/test/mock_quick_answers_client.h" +#include "chrome/browser/ui/ash/quick_answers/ui/magic_boost_user_consent_view.h" #include "chrome/browser/ui/ash/quick_answers/ui/quick_answers_view.h" #include "chrome/browser/ui/ash/quick_answers/ui/rich_answers_view.h" #include "chrome/browser/ui/ash/quick_answers/ui/user_consent_view.h" @@ -420,6 +422,88 @@ }; IN_PROC_BROWSER_TEST_P(QuickAnswersBrowserTest, + MagicBoostConsentViewOnPendingDisclaimer) { + if (!IsMagicBoostEnabled()) { + GTEST_SKIP() << "This test only applies when Magic Boost is enabled."; + } + + // Enable Magic Boost. + chrome_test_utils::GetProfile(this)->GetPrefs()->SetBoolean( + ash::prefs::kMagicBoostEnabled, true); + + // Assert that HMR is enabled and consent is pending. + ASSERT_TRUE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean( + ash::prefs::kHmrEnabled)); + ASSERT_EQ(chrome_test_utils::GetProfile(this)->GetPrefs()->GetInteger( + ash::prefs::kHMRConsentStatus), + static_cast<int>(chromeos::HMRConsentStatus::kPendingDisclaimer)); + + // Set up mock client to return a dictionary intent. + QuickAnswersState::Get()->set_use_text_annotator_for_testing(); + auto mock_quick_answers_client = CreateMockQuickAnswersClient(); + ON_CALL(*mock_quick_answers_client, SendRequestForPreprocessing) + .WillByDefault([this](const quick_answers::QuickAnswersRequest& request) { + QuickAnswersRequest processed_request = request; + processed_request.preprocessed_output.intent_info.intent_type = + IntentType::kDictionary; + processed_request.preprocessed_output.intent_info.intent_text = + request.selected_text; + static_cast<QuickAnswersControllerImpl*>(controller()) + ->OnRequestPreprocessFinished(processed_request); + }); + controller()->SetClient(std::move(mock_quick_answers_client)); + + // Trigger Quick Answers. + views::NamedWidgetShownWaiter consent_view_widget_waiter( + views::test::AnyWidgetTestPasskey(), + chromeos::ReadWriteCardsUiController::kWidgetName); + + ShowMenuParams params; + params.selected_text = kTestQuery; + ShowMenuAndWait(params); + + views::Widget* consent_view_widget = + consent_view_widget_waiter.WaitIfNeededAndGet(); + ASSERT_TRUE(consent_view_widget); + + // Confirm that MagicBoostUserConsentView is shown. + auto* consent_view = static_cast<QuickAnswersControllerImpl*>(controller()) + ->quick_answers_ui_controller() + ->magic_boost_user_consent_view(); + EXPECT_TRUE(consent_view); + EXPECT_TRUE(consent_view->GetVisible()); +} + +IN_PROC_BROWSER_TEST_P(QuickAnswersBrowserTest, + QuickAnswersDisabledWhenHmrIsDisabled) { + if (!IsMagicBoostEnabled()) { + GTEST_SKIP() << "This test only applies when Magic Boost is enabled."; + } + + // Simulate a user who has consented to GenAI features but has disabled the + // HMR feature. + Profile* profile = chrome_test_utils::GetProfile(this); + profile->GetPrefs()->SetBoolean(ash::prefs::kMagicBoostEnabled, true); + profile->GetPrefs()->SetInteger( + ash::prefs::kHMRConsentStatus, + static_cast<int>(chromeos::HMRConsentStatus::kApproved)); + profile->GetPrefs()->SetBoolean(ash::prefs::kHmrEnabled, false); + + // Trigger the context menu. + ShowMenuParams params; + params.selected_text = kTestQuery; + base::test::TestFuture<void> future; + static_cast<QuickAnswersControllerImpl*>(controller()) + ->SetOnTextAvailableCallbackForTesting(future.GetCallback()); + ShowMenuAndWait(params); + EXPECT_TRUE(future.Wait()); + + // Verify that no Quick Answers UI is shown. + EXPECT_EQ(controller()->GetQuickAnswersVisibility(), + QuickAnswersVisibility::kClosed); +} + +IN_PROC_BROWSER_TEST_P(QuickAnswersBrowserTest, QuickAnswersViewAboveNotification) { SetQuickAnswersEnabled(true); @@ -761,10 +845,10 @@ controller()->GetQuickAnswersVisibility()); } -INSTANTIATE_TEST_SUITE_P( - /* no prefix */, - QuickAnswersBrowserTest, - ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(All, + QuickAnswersBrowserTest, + testing::Bool(), + &QuickAnswersBrowserTest::GetTestVariantName); class RichAnswersBrowserTest : public QuickAnswersBrowserTest { protected: @@ -951,9 +1035,9 @@ l10n_util::GetStringUTF8(IDS_RICH_ANSWERS_VIEW_A11Y_NAME_TEXT)); } -INSTANTIATE_TEST_SUITE_P( - /* no prefix */, - RichAnswersBrowserTest, - ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(All, + RichAnswersBrowserTest, + testing::Bool(), + &RichAnswersBrowserTest::GetTestVariantName); } // namespace quick_answers
diff --git a/chrome/browser/ui/ash/quick_answers/quick_answers_browsertest_base.h b/chrome/browser/ui/ash/quick_answers/quick_answers_browsertest_base.h index a4f2fbe4..95459c9 100644 --- a/chrome/browser/ui/ash/quick_answers/quick_answers_browsertest_base.h +++ b/chrome/browser/ui/ash/quick_answers/quick_answers_browsertest_base.h
@@ -13,6 +13,11 @@ class QuickAnswersBrowserTestBase : public InProcessBrowserTest, public testing::WithParamInterface<bool> { public: + static std::string GetTestVariantName( + const testing::TestParamInfo<bool>& info) { + return info.param ? "MagicBoostOn" : "MagicBoostOff"; + } + struct ShowMenuParams { std::string selected_text; int x = 0;
diff --git a/chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.cc b/chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.cc index 2dd57363..5c298d8 100644 --- a/chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.cc +++ b/chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.cc
@@ -223,7 +223,14 @@ const gfx::Rect& anchor_bounds, const std::string& selected_text, const std::string& surrounding_text) { + base::ScopedClosureRunner runner( + std::move(on_text_available_callback_for_testing_)); + if (runner) { + CHECK_IS_TEST(); + } + if (!ShouldShowQuickAnswers()) { + visibility_ = QuickAnswersVisibility::kClosed; return; } @@ -569,6 +576,12 @@ time_tick_now_function_ = time_tick_now_function; } +void QuickAnswersControllerImpl::SetOnTextAvailableCallbackForTesting( + base::OnceClosure callback) { + CHECK_IS_TEST(); + on_text_available_callback_for_testing_ = std::move(callback); +} + base::WeakPtr<QuickAnswersControllerImpl> QuickAnswersControllerImpl::GetWeakPtr() { return weak_factory_.GetWeakPtr();
diff --git a/chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h b/chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h index 14d1b6d..7f61f07 100644 --- a/chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h +++ b/chrome/browser/ui/ash/quick_answers/quick_answers_controller_impl.h
@@ -85,6 +85,7 @@ void OverrideTimeTickNowForTesting( TimeTickNowFunction time_tick_now_function); + void SetOnTextAvailableCallbackForTesting(base::OnceClosure callback); void ShowMagicBoostDisclaimerView(); @@ -179,6 +180,8 @@ // defined in an unnamed namespace. std::unique_ptr<QuickAnswersStateObserver> perform_on_consent_accepted_; + base::OnceClosure on_text_available_callback_for_testing_; + base::WeakPtrFactory<QuickAnswersControllerImpl> weak_factory_{this}; };
diff --git a/chrome/browser/ui/ash/quick_answers/quick_answers_controller_unittest.cc b/chrome/browser/ui/ash/quick_answers/quick_answers_controller_unittest.cc index 64beb25c..ce56debd 100644 --- a/chrome/browser/ui/ash/quick_answers/quick_answers_controller_unittest.cc +++ b/chrome/browser/ui/ash/quick_answers/quick_answers_controller_unittest.cc
@@ -248,6 +248,8 @@ chromeos::test::FakeMagicBoostState fake_magic_boost_state; fake_magic_boost_state.SetAvailability(true); + fake_magic_boost_state.SetMagicBoostEnabled(true); + fake_magic_boost_state.AsyncWriteHMREnabled(true); fake_magic_boost_state.AsyncWriteConsentStatus( chromeos::HMRConsentStatus::kUnset); @@ -276,6 +278,8 @@ chromeos::test::FakeMagicBoostState fake_magic_boost_state; fake_magic_boost_state.SetAvailability(false); + fake_magic_boost_state.SetMagicBoostEnabled(true); + fake_magic_boost_state.AsyncWriteHMREnabled(true); fake_magic_boost_state.AsyncWriteConsentStatus( chromeos::HMRConsentStatus::kUnset);
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc index 0057311..58e9852 100644 --- a/chrome/browser/ui/autofill/chrome_autofill_client.cc +++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -14,6 +14,7 @@ #include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" +#include "base/metrics/histogram_functions.h" #include "base/metrics/user_metrics.h" #include "base/notreached.h" #include "base/rand_util.h" @@ -91,6 +92,7 @@ #include "components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.h" #include "components/autofill/core/browser/integrators/plus_addresses/autofill_plus_address_delegate.h" #include "components/autofill/core/browser/logging/log_router.h" +#include "components/autofill/core/browser/metrics/autofill_settings_metrics.h" #include "components/autofill/core/browser/payments/payments_network_interface.h" #include "components/autofill/core/browser/single_field_fillers/single_field_fill_router.h" #include "components/autofill/core/browser/studies/autofill_experiments.h" @@ -742,9 +744,15 @@ #if BUILDFLAG(IS_ANDROID) switch (suggestion_type) { case SuggestionType::kManageAddress: + base::UmaHistogramEnumeration( + "Autofill.AddressesSettingsPage.VisitReferrer", + autofill_metrics::AutofillSettingsReferrer::kFillingFlowDropdown); ShowAutofillProfileSettings(web_contents()); return; case SuggestionType::kManageCreditCard: + base::UmaHistogramEnumeration( + "Autofill.PaymentMethodsSettingsPage.VisitReferrer", + autofill_metrics::AutofillSettingsReferrer::kFillingFlowDropdown); ShowAutofillCreditCardSettings(web_contents()); return; default: @@ -755,6 +763,9 @@ if (browser) { switch (suggestion_type) { case SuggestionType::kManageAddress: + base::UmaHistogramEnumeration( + "Autofill.AddressesSettingsPage.VisitReferrer", + autofill_metrics::AutofillSettingsReferrer::kFillingFlowDropdown); chrome::ShowSettingsSubPage(browser, chrome::kAddressesSubPage); return; case SuggestionType::kManageAutofillAi: @@ -769,6 +780,9 @@ return; case SuggestionType::kManageCreditCard: case SuggestionType::kManageIban: + base::UmaHistogramEnumeration( + "Autofill.PaymentMethodsSettingsPage.VisitReferrer", + autofill_metrics::AutofillSettingsReferrer::kFillingFlowDropdown); chrome::ShowSettingsSubPage(browser, chrome::kPaymentsSubPage); return; case SuggestionType::kManageLoyaltyCard:
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client_interactive_uitest.cc b/chrome/browser/ui/autofill/chrome_autofill_client_interactive_uitest.cc index 072b300..3fcad2f3 100644 --- a/chrome/browser/ui/autofill/chrome_autofill_client_interactive_uitest.cc +++ b/chrome/browser/ui/autofill/chrome_autofill_client_interactive_uitest.cc
@@ -4,6 +4,7 @@ #include "base/i18n/rtl.h" #include "base/memory/weak_ptr.h" +#include "base/test/metrics/histogram_tester.h" #include "base/test/run_until.h" #include "chrome/browser/ui/autofill/chrome_autofill_client.h" #include "chrome/browser/ui/browser.h" @@ -19,6 +20,7 @@ #include "components/autofill/core/browser/foundations/autofill_client.h" #include "components/autofill/core/browser/foundations/browser_autofill_manager.h" #include "components/autofill/core/browser/foundations/browser_autofill_manager_test_api.h" +#include "components/autofill/core/browser/metrics/autofill_settings_metrics.h" #include "components/autofill/core/browser/suggestions/suggestion.h" #include "components/autofill/core/browser/suggestions/suggestion_type.h" #include "components/autofill/core/browser/test_utils/autofill_test_utils.h" @@ -231,5 +233,24 @@ } } +IN_PROC_BROWSER_TEST_F(ChromeAutofillClientBrowserTest, + ShowAutofillSettings_RecordsMetrics) { + base::HistogramTester histogram_tester; + client()->ShowAutofillSettings(SuggestionType::kManageAddress); + histogram_tester.ExpectUniqueSample( + "Autofill.AddressesSettingsPage.VisitReferrer", + autofill_metrics::AutofillSettingsReferrer::kFillingFlowDropdown, 1); + + client()->ShowAutofillSettings(SuggestionType::kManageCreditCard); + histogram_tester.ExpectUniqueSample( + "Autofill.PaymentMethodsSettingsPage.VisitReferrer", + autofill_metrics::AutofillSettingsReferrer::kFillingFlowDropdown, 1); + + client()->ShowAutofillSettings(SuggestionType::kManageIban); + histogram_tester.ExpectUniqueSample( + "Autofill.PaymentMethodsSettingsPage.VisitReferrer", + autofill_metrics::AutofillSettingsReferrer::kFillingFlowDropdown, 2); +} + } // namespace } // namespace autofill
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h index 65905d6..dba0d118 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/functional/callback_forward.h" +#include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/bookmarks/bookmark_stats.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index 6df5654f..45a1606 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -50,6 +50,7 @@ #include "ui/color/color_provider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/gfx/image/image_skia_source.h" #include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskImpl.java b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskImpl.java index 668ffb2..47e4d20 100644 --- a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskImpl.java +++ b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskImpl.java
@@ -472,7 +472,7 @@ Activity activity = activityWindowAndroid.getActivity().get(); if (activity == null) return; // No maximize action in non desktop window mode. - if (!isInDesktopWindowing(activity.getWindowManager())) return; + if (!activity.isInMultiWindowMode()) return; if (isRestoredInternalLocked(activityWindowAndroid)) { mRestoredBounds = getBoundsInternalLocked(); } @@ -716,11 +716,13 @@ if (activityWindowAndroid == null) return false; var activity = activityWindowAndroid.getActivity().get(); if (activity == null) return false; - var windowManager = activity.getWindowManager(); - if (isInDesktopWindowing(windowManager)) { - return getBoundsInternalLocked().equals(getMaximizedBounds(windowManager)); + if (activity.isInMultiWindowMode()) { + // Desktop windowing mode is also a multi-window mode. + return getBoundsInternalLocked() + .equals(getMaximizedBounds(activity.getWindowManager())); } else { - return !activity.isInMultiWindowMode(); + // In non-multi-window mode, Chrome is maximized by default. + return true; } } @@ -786,12 +788,10 @@ 0, insets.top, fullscreenBounds.right, fullscreenBounds.bottom - insets.bottom); } - @RequiresApi(api = VERSION_CODES.R) - // TODO(crbug.com/437982549): Replace with a more versatile API to improve OEM compatibility. - private static boolean isInDesktopWindowing(WindowManager windowManager) { - return windowManager - .getCurrentWindowMetrics() - .getWindowInsets() - .isVisible(WindowInsets.Type.captionBar()); + @VisibleForTesting + @Nullable Rect getRestoredBoundsForTesting() { + synchronized (mActivityWindowAndroidLock) { + return mRestoredBounds; + } } }
diff --git a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskImplUnitTest.java b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskImplUnitTest.java index ab7596d9..79466bd 100644 --- a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskImplUnitTest.java +++ b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskImplUnitTest.java
@@ -690,16 +690,16 @@ /* taskId= */ 1); var chromeAndroidTask = (ChromeAndroidTaskImpl) chromeAndroidTaskWithMockDeps.mChromeAndroidTask; + var mockActivityWindowAndroid = + chromeAndroidTaskWithMockDeps + .mActivityWindowAndroidMocks + .mMockActivityWindowAndroid; var mockActivity = chromeAndroidTaskWithMockDeps.mActivityWindowAndroidMocks.mMockActivity; var mockWindowManager = chromeAndroidTaskWithMockDeps.mActivityWindowAndroidMocks.mMockWindowManager; - // Mock isInDesktopWindowing() to return true. - var mockWindowMetrics = mock(WindowMetrics.class); - var mockWindowInsets = mock(WindowInsets.class); - when(mockWindowManager.getCurrentWindowMetrics()).thenReturn(mockWindowMetrics); - when(mockWindowMetrics.getWindowInsets()).thenReturn(mockWindowInsets); - when(mockWindowInsets.isVisible(WindowInsets.Type.captionBar())).thenReturn(true); + // Mock isInMultiWindowMode() to return true. + when(mockActivity.isInMultiWindowMode()).thenReturn(true); // Mock getMaximizedBounds(). var mockMaxWindowMetrics = mock(WindowMetrics.class); @@ -741,18 +741,22 @@ /* taskId= */ 1); var chromeAndroidTask = (ChromeAndroidTaskImpl) chromeAndroidTaskWithMockDeps.mChromeAndroidTask; + var mockActivityWindowAndroid = + chromeAndroidTaskWithMockDeps + .mActivityWindowAndroidMocks + .mMockActivityWindowAndroid; var mockWindowManager = chromeAndroidTaskWithMockDeps.mActivityWindowAndroidMocks.mMockWindowManager; - // Mock isInDesktopWindowing() to return true. + // Mock isInMultiWindowMode() to return true. var mockWindowMetrics = mock(WindowMetrics.class); - var mockWindowInsets = mock(WindowInsets.class); - when(mockWindowManager.getCurrentWindowMetrics()).thenReturn(mockWindowMetrics); - when(mockWindowMetrics.getWindowInsets()).thenReturn(mockWindowInsets); - when(mockWindowInsets.isVisible(WindowInsets.Type.captionBar())).thenReturn(true); + when(chromeAndroidTaskWithMockDeps.mActivityWindowAndroidMocks.mMockActivity + .isInMultiWindowMode()) + .thenReturn(true); // Mock getBounds() to return non-maximized bounds. var currentBounds = new Rect(0, 0, 800, 600); + when(mockWindowManager.getCurrentWindowMetrics()).thenReturn(mockWindowMetrics); when(mockWindowMetrics.getBounds()).thenReturn(currentBounds); // Mock getMaximizedBounds(). @@ -811,6 +815,10 @@ ChromeAndroidTaskUnitTestSupport.createChromeAndroidTaskWithMockDeps(taskId); var chromeAndroidTask = (ChromeAndroidTaskImpl) chromeAndroidTaskWithMockDeps.mChromeAndroidTask; + var mockActivityWindowAndroid = + chromeAndroidTaskWithMockDeps + .mActivityWindowAndroidMocks + .mMockActivityWindowAndroid; var mockActivity = chromeAndroidTaskWithMockDeps.mActivityWindowAndroidMocks.mMockActivity; var mockWindowManager = chromeAndroidTaskWithMockDeps.mActivityWindowAndroidMocks.mMockWindowManager; @@ -825,14 +833,15 @@ // 1. Mock isMinimizedInternalLocked() to be false. (Assuming task is visible) ApplicationStatus.onStateChangeForTesting(mockActivity, ActivityState.CREATED); ApplicationStatus.onStateChangeForTesting(mockActivity, ActivityState.RESUMED); - assertFalse(chromeAndroidTask.isMinimized()); + assertFalse("Task is minimized", chromeAndroidTask.isMinimized()); // 2. Mock isMaximizedInternalLocked() to be false. + // Mock isInMultiWindowMode() to return true. var mockWindowMetrics = mock(WindowMetrics.class); - var mockWindowInsets = mock(WindowInsets.class); when(mockWindowManager.getCurrentWindowMetrics()).thenReturn(mockWindowMetrics); - when(mockWindowMetrics.getWindowInsets()).thenReturn(mockWindowInsets); - when(mockWindowInsets.isVisible(WindowInsets.Type.captionBar())).thenReturn(true); + when(chromeAndroidTaskWithMockDeps.mActivityWindowAndroidMocks.mMockActivity + .isInMultiWindowMode()) + .thenReturn(true); var restoredBounds = new Rect(0, 0, 800, 600); when(mockWindowMetrics.getBounds()).thenReturn(restoredBounds); @@ -844,13 +853,20 @@ when(mockMaxWindowInsets.getInsets(WindowInsets.Type.tappableElement())) .thenReturn(Insets.of(0, 0, 0, 0)); when(mockMaxWindowMetrics.getBounds()).thenReturn(new Rect(0, 0, 1920, 1080)); + assertFalse("Task is maximized", chromeAndroidTask.isMaximized()); // 3. Mock isFullscreenInternalLocked() to be false. when(mockMaxWindowInsets.isVisible(WindowInsets.Type.statusBars())).thenReturn(true); + assertFalse("Task is fullscreen", chromeAndroidTask.isFullscreen()); // Call maximize(). This should set mRestoredBounds to the current bounds. chromeAndroidTask.maximize(); + assertEquals( + "restored bounds should be set to the current bounds", + restoredBounds, + chromeAndroidTask.getRestoredBoundsForTesting()); + // Act chromeAndroidTask.restore();
diff --git a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskIntegrationTest.java b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskIntegrationTest.java index 6d12f8b6..f4c6c97 100644 --- a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskIntegrationTest.java +++ b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskIntegrationTest.java
@@ -20,6 +20,7 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.chromium.base.ApplicationStatus; import org.chromium.base.test.util.Batch; import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CriteriaHelper; @@ -237,6 +238,12 @@ // Assert assertTrue(ntpStation.getActivity().isFinishing()); + CriteriaHelper.pollUiThread( + () -> ntpStation.getActivity().isDestroyed(), "activity to be destroyed"); + assertEquals( + "only one activity should be running", + 1, + ApplicationStatus.getRunningActivities().size()); } @Test @@ -363,8 +370,14 @@ var chromeAndroidTask = getChromeAndroidTask(taskId); assertNotNull(chromeAndroidTask); - // Assert: by default, app is maximized in non desktop windowing mode. - assertTrue(chromeAndroidTask.isMaximized()); + // Assert + assertEquals( + "only one activity should be running", + 1, + ApplicationStatus.getRunningActivities().size()); + assertTrue( + "App should be maximized in non desktop windowing mode", + chromeAndroidTask.isMaximized()); } @Test
diff --git a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm index fa4548ad..b2a57d8a 100644 --- a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm +++ b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm
@@ -42,6 +42,7 @@ #include "ui/gfx/color_palette.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_util_mac.h" #include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/cocoa/touchbar/credit_card_autofill_touch_bar_controller.mm b/chrome/browser/ui/cocoa/touchbar/credit_card_autofill_touch_bar_controller.mm index 57d82c9..b497e38 100644 --- a/chrome/browser/ui/cocoa/touchbar/credit_card_autofill_touch_bar_controller.mm +++ b/chrome/browser/ui/cocoa/touchbar/credit_card_autofill_touch_bar_controller.mm
@@ -20,6 +20,7 @@ #include "components/grit/components_scaled_resources.h" #import "ui/base/cocoa/touch_bar_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_util_mac.h" #include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc index d824bfe..ef3d5d0 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
@@ -56,6 +56,7 @@ #include "ui/gfx/color_palette.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/favicon_size.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/vector_icon_types.h"
diff --git a/chrome/browser/ui/extensions/BUILD.gn b/chrome/browser/ui/extensions/BUILD.gn index 0035caf..8cc02481 100644 --- a/chrome/browser/ui/extensions/BUILD.gn +++ b/chrome/browser/ui/extensions/BUILD.gn
@@ -29,6 +29,7 @@ if (is_android) { sources += [ "extension_install_ui_android.h" ] + public_deps += [ "//components/messages/android" ] } if (is_win || is_mac || is_linux || is_chromeos) {
diff --git a/chrome/browser/ui/extensions/reload_page_dialog_controller.cc b/chrome/browser/ui/extensions/reload_page_dialog_controller.cc index 76fd959..f5bc4a42 100644 --- a/chrome/browser/ui/extensions/reload_page_dialog_controller.cc +++ b/chrome/browser/ui/extensions/reload_page_dialog_controller.cc
@@ -10,6 +10,7 @@ #include "base/functional/callback_forward.h" #include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/ui/extensions/extension_dialog_utils.h" #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" @@ -25,6 +26,12 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/dialog_model.h" +#if BUILDFLAG(IS_ANDROID) +#include "components/messages/android/message_dispatcher_bridge.h" +#include "components/messages/android/message_enums.h" +#include "components/messages/android/message_wrapper.h" +#endif // BUILDFLAG(IS_ANDROID) + namespace { // Whether the dialog should be accepted without showing it on tests. @@ -127,6 +134,35 @@ } void ReloadPageDialogController::Show() { +#if BUILDFLAG(IS_ANDROID) + message_ = std::make_unique<messages::MessageWrapper>( + messages::MessageIdentifier::RELOAD_PAGE, + base::BindOnce(&ReloadPageDialogController::OnAcceptSelected, + weak_ptr_factory_.GetWeakPtr()), + base::DoNothing()); + + message_->SetTitle(GetTitle(extensions_info_)); + message_->SetPrimaryButtonText( + l10n_util::GetStringUTF16(IDS_EXTENSION_RELOAD_PAGE_BUBBLE_OK_BUTTON)); + + if (base::FeatureList::IsEnabled( + extensions_features::kExtensionsMenuAccessControl)) { + int extensions_count = extensions_info_.size(); + if (extensions_count == 1 && !extensions_info_[0].icon.IsEmpty()) { + message_->SetIcon(extensions_info_[0].icon.AsBitmap()); + } else if (extensions_count > 1) { + // TODO (crbug.com/424012380): The message UI on Android doesn't support + // displaying a list of extensions like the desktop dialog. This case + // needs to be handled differently for Android. For now, no icon will be + // shown for multiple extensions. + } + } + + messages::MessageDispatcherBridge::Get()->EnqueueMessage( + message_.get(), web_contents_, messages::MessageScopeType::NAVIGATION, + messages::MessagePriority::kNormal); + +#else ui::DialogModel::Builder dialog_builder; dialog_builder.SetTitle(GetTitle(extensions_info_)) .AddOkButton(base::BindOnce(&ReloadPageDialogController::OnAcceptSelected, @@ -165,6 +201,7 @@ ShowDialog(web_contents_->GetTopLevelNativeWindow(), extension_ids, dialog_builder.Build()); +#endif // BUILDFLAG(IS_ANDROID) } void ReloadPageDialogController::OnExtensionIconLoaded(
diff --git a/chrome/browser/ui/extensions/reload_page_dialog_controller.h b/chrome/browser/ui/extensions/reload_page_dialog_controller.h index cfc06fd..86e422e1 100644 --- a/chrome/browser/ui/extensions/reload_page_dialog_controller.h +++ b/chrome/browser/ui/extensions/reload_page_dialog_controller.h
@@ -11,11 +11,17 @@ #include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "extensions/common/extension_id.h" #include "ui/base/interaction/element_identifier.h" #include "ui/gfx/image/image.h" #include "ui/gfx/native_ui_types.h" +#if BUILDFLAG(IS_ANDROID) +#include "components/messages/android/message_enums.h" +#include "components/messages/android/message_wrapper.h" +#endif // BUILDFLAG(IS_ANDROID) + namespace content { class BrowserContext; class WebContents; @@ -74,6 +80,10 @@ // Information for the extensions to be displayed in the dialog. std::vector<ExtensionInfo> extensions_info_; +#if BUILDFLAG(IS_ANDROID) + std::unique_ptr<messages::MessageWrapper> message_; +#endif // BUILDFLAG(IS_ANDROID) + base::WeakPtrFactory<ReloadPageDialogController> weak_ptr_factory_{this}; };
diff --git a/chrome/browser/ui/extensions/reload_page_dialog_controller_android_browsertest.cc b/chrome/browser/ui/extensions/reload_page_dialog_controller_android_browsertest.cc new file mode 100644 index 0000000..b4d4a10 --- /dev/null +++ b/chrome/browser/ui/extensions/reload_page_dialog_controller_android_browsertest.cc
@@ -0,0 +1,119 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/extensions/reload_page_dialog_controller.h" + +#include "base/files/file_util.h" +#include "base/strings/stringprintf.h" +#include "base/test/scoped_feature_list.h" +#include "base/threading/thread_restrictions.h" +#include "chrome/browser/extensions/extension_browsertest.h" +#include "chrome/browser/extensions/extension_util.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/grit/generated_resources.h" +#include "chrome/test/base/chrome_test_utils.h" +#include "components/messages/android/message_enums.h" +#include "components/messages/android/message_wrapper.h" +#include "components/messages/android/mock_message_dispatcher_bridge.h" +#include "content/public/browser/web_contents.h" +#include "content/public/test/browser_test.h" +#include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" +#include "extensions/common/extension_features.h" +#include "extensions/test/test_extension_dir.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" + +class ReloadPageDialogControllerAndroidBrowserTest + : public extensions::ExtensionBrowserTest { + public: + ReloadPageDialogControllerAndroidBrowserTest() { + feature_list_.InitAndEnableFeature( + extensions_features::kExtensionsMenuAccessControl); + } + + void SetUp() override { + extensions::ExtensionBrowserTest::SetUp(); + message_dispatcher_bridge_.SetMessagesEnabledForEmbedder(true); + messages::MessageDispatcherBridge::SetInstanceForTesting( + &message_dispatcher_bridge_); + } + void TearDown() override { + reload_page_dialog_.reset(); + messages::MessageDispatcherBridge::SetInstanceForTesting(nullptr); + extensions::ExtensionBrowserTest::TearDown(); + } + + protected: + messages::MockMessageDispatcherBridge* message_dispatcher_bridge() { + return &message_dispatcher_bridge_; + } + std::unique_ptr<extensions::ReloadPageDialogController> reload_page_dialog_; + + const extensions::Extension* InstallExtensionAndroid( + const std::string& name) { + static constexpr char kManifest[] = + R"({ + "name": "Test Extension", + "version": "0.1", + "manifest_version": 3 + })"; + + extensions::TestExtensionDir test_dir; + test_dir.WriteManifest(kManifest); + return LoadExtension(test_dir.UnpackedPath()); + } + + private: + messages::MockMessageDispatcherBridge message_dispatcher_bridge_; + base::test::ScopedFeatureList feature_list_; +}; + +MATCHER_P(IsExpectedMessage, extension, "") { + std::u16string fixed_up_name = + extensions::util::GetFixupExtensionNameForUIDisplay( + base::UTF8ToUTF16(extension->name())); + std::u16string expected_title = l10n_util::GetStringFUTF16( + IDS_EXTENSION_RELOAD_PAGE_BUBBLE_ALLOW_SINGLE_EXTENSION_TITLE, + fixed_up_name); + if (arg->GetTitle() != expected_title) { + *result_listener << "title is " << arg->GetTitle() << ", expected " + << expected_title; + return false; + } + std::u16string expected_button_text = + l10n_util::GetStringUTF16(IDS_EXTENSION_RELOAD_PAGE_BUBBLE_OK_BUTTON); + if (arg->GetPrimaryButtonText() != expected_button_text) { + *result_listener << "primary button text is " << arg->GetPrimaryButtonText() + << ", expected " << expected_button_text; + return false; + } + return true; +} + +IN_PROC_BROWSER_TEST_F(ReloadPageDialogControllerAndroidBrowserTest, + ShowMessage_SingleExtension) { + content::WebContents* web_contents = GetActiveWebContents(); + ASSERT_NE(nullptr, web_contents); + ASSERT_TRUE(NavigateToURL(web_contents, GURL("about:blank"))); + + const extensions::Extension* extension = InstallExtensionAndroid("Extension"); + ASSERT_NE(nullptr, extension); + std::vector<const extensions::Extension*> extensions = {extension}; + + using testing::_; + messages::MessageDispatcherBridge::SetInstanceForTesting( + message_dispatcher_bridge()); + EXPECT_CALL(*message_dispatcher_bridge(), + EnqueueMessage(IsExpectedMessage(extension), _, + messages::MessageScopeType::NAVIGATION, + messages::MessagePriority::kNormal)) + .Times(1); + + reload_page_dialog_ = + std::make_unique<extensions::ReloadPageDialogController>( + GetActiveWebContents(), GetProfile()); + reload_page_dialog_->TriggerShow(extensions); +}
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_observer.cc b/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_observer.cc index 2d918c5..5e322c1 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_observer.cc +++ b/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_observer.cc
@@ -28,6 +28,7 @@ #include "components/tabs/public/tab_group.h" using collaboration::messaging::MessagingBackendServiceFactory; +using collaboration::messaging::PersistentNotificationType; namespace tab_groups { namespace { @@ -208,7 +209,7 @@ void CollaborationMessagingObserver::OnMessagingBackendServiceInitialized() { CHECK(service_); - auto messages = service_->GetMessages(std::nullopt); + auto messages = service_->GetMessages(PersistentNotificationType::UNDEFINED); for (const auto& message : messages) { DispatchMessage(message, MessageDisplayStatus::kDisplay); }
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data.cc b/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data.cc index 4989e24..2e0defc 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data.cc +++ b/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data.cc
@@ -23,6 +23,7 @@ #include "ui/compositor/compositor.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_util.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/widget/widget.h"
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data.h b/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data.h index 565278f2..298380a 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data.h +++ b/chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data.h
@@ -7,6 +7,7 @@ #include "base/callback_list.h" #include "base/check_is_test.h" +#include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "components/collaboration/public/messaging/message.h"
diff --git a/chrome/browser/ui/views/page_action/page_action_icon_view.h b/chrome/browser/ui/views/page_action/page_action_icon_view.h index 2d6226f..d42ab03 100644 --- a/chrome/browser/ui/views/page_action/page_action_icon_view.h +++ b/chrome/browser/ui/views/page_action/page_action_icon_view.h
@@ -14,7 +14,6 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/gfx/color_palette.h" -#include "ui/gfx/image/image_skia.h" #include "ui/views/animation/ink_drop_host.h" #include "ui/views/controls/image_view.h"
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.cc b/chrome/browser/ui/views/profiles/profile_menu_view.cc index b73f2f88..3b0253e0 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -75,6 +75,7 @@ #include "chrome/grit/branded_strings.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/theme_resources.h" +#include "components/autofill/core/browser/metrics/autofill_settings_metrics.h" #include "components/feature_engagement/public/feature_constants.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" @@ -535,6 +536,9 @@ if (!perform_menu_actions()) { return; } + base::UmaHistogramEnumeration( + "Autofill.AutofillAndPasswordsSettingsPage.VisitReferrer", + autofill::autofill_metrics::AutofillSettingsReferrer::kProfileMenu); chrome::ShowSettingsSubPage(&browser(), chrome::kAutofillSubPage); }
diff --git a/chrome/browser/ui/views/status_icons/status_icon_button_linux.cc b/chrome/browser/ui/views/status_icons/status_icon_button_linux.cc index 8492e83..2670c33c 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_button_linux.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_button_linux.cc
@@ -16,6 +16,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/transform.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/native_ui_types.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/scoped_canvas.h"
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index bc58668..bdb0ecf7 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -691,10 +691,18 @@ } #if BUILDFLAG(IS_CHROMEOS) - browser_view_->GetWidget()->GetNativeWindow()->ClearProperty( - ash::kIsDraggingTabsKey); - browser_view_->GetWidget()->GetNativeWindow()->ClearProperty( - ash::kTabDraggingSourceWindowKey); + // Clear the drag properties unless the drag browser's tabs got merged into + // another browser, in which case SplitViewController::TabDragWindowObserver + // still needs to read the properties. We detect this case by checking if the + // tab strip model is now empty. Since it was non-empty originally and the + // drag browser can't have any pending downloads. we know that it's about to + // get destroyed anyways. + if (!browser_view_->browser()->tab_strip_model()->empty()) { + browser_view_->GetWidget()->GetNativeWindow()->ClearProperty( + ash::kIsDraggingTabsKey); + browser_view_->GetWidget()->GetNativeWindow()->ClearProperty( + ash::kTabDraggingSourceWindowKey); + } #endif // BUILDFLAG(IS_CHROMEOS) }
diff --git a/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.h b/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.h index ef990841..0c1a8b7 100644 --- a/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.h +++ b/chrome/browser/ui/webui/top_chrome/webui_contents_wrapper.h
@@ -192,8 +192,8 @@ template <typename T> class WebUIContentsWrapperT : public WebUIContentsWrapper { public: - // Helper to allow static_assert to concatenate string_view at build time. - static consteval std::string ConcatStrings( + // Helper to allow static_assert to concatenate string_view. + static constexpr std::string ConcatStrings( std::initializer_list<std::string_view> strs) { std::string result; size_t total_length = 0;
diff --git a/chrome/browser/web_applications/navigation_capturing_browser_navigator_browsertest.cc b/chrome/browser/web_applications/navigation_capturing_browser_navigator_browsertest.cc index 9e47cac7..24ed07d 100644 --- a/chrome/browser/web_applications/navigation_capturing_browser_navigator_browsertest.cc +++ b/chrome/browser/web_applications/navigation_capturing_browser_navigator_browsertest.cc
@@ -452,8 +452,18 @@ NavigationCapturingDisplayModeResult::kAppStandaloneFinalStandalone)); } -IN_PROC_BROWSER_TEST_F(NavigationCapturingBrowserNavigatorBrowserTest, - NavigateBrowserUsedForNavigateExistingToBrowserTab) { +// This test is flaky on the Mac 13 bot. +// TODO(crbug.com/447403523): Enable the test on Mac bots. +#if BUILDFLAG(IS_MAC) +#define MAYBE_NavigateBrowserUsedForNavigateExistingToBrowserTab \ + DISABLED_NavigateBrowserUsedForNavigateExistingToBrowserTab +#else +#define MAYBE_NavigateBrowserUsedForNavigateExistingToBrowserTab \ + NavigateBrowserUsedForNavigateExistingToBrowserTab +#endif +IN_PROC_BROWSER_TEST_F( + NavigationCapturingBrowserNavigatorBrowserTest, + MAYBE_NavigateBrowserUsedForNavigateExistingToBrowserTab) { // Test that the browser provided in NavigateParams is used when using a // browser to open a browser tab, instead of the most recently active browser. const webapps::AppId& app_id = InstallTestWebApp(
diff --git a/chrome/browser/web_applications/web_app_icon_generator.h b/chrome/browser/web_applications/web_app_icon_generator.h index 6dd0c02..79fa531 100644 --- a/chrome/browser/web_applications/web_app_icon_generator.h +++ b/chrome/browser/web_applications/web_app_icon_generator.h
@@ -15,7 +15,10 @@ #include "chrome/browser/web_applications/web_app_install_info.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/image/image_skia.h" + +namespace gfx { +class ImageSkia; +} namespace web_app {
diff --git a/chrome/browser/web_applications/web_app_icon_generator_unittest.cc b/chrome/browser/web_applications/web_app_icon_generator_unittest.cc index 02006ef46..3618d002 100644 --- a/chrome/browser/web_applications/web_app_icon_generator_unittest.cc +++ b/chrome/browser/web_applications/web_app_icon_generator_unittest.cc
@@ -17,6 +17,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/color_utils.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_rep.h" namespace web_app {
diff --git a/chrome/build/android-arm32.pgo.txt b/chrome/build/android-arm32.pgo.txt index abf7788..19df498 100644 --- a/chrome/build/android-arm32.pgo.txt +++ b/chrome/build/android-arm32.pgo.txt
@@ -1 +1 @@ -chrome-android32-main-1758801414-3dba2f977793102b59ce4bb8fd128b8889a47768-523a1ac6933cf8d531d918185046145e023708fa.profdata +chrome-android32-main-1758866082-8a235d1b8b489bc36d6266e9b9e820074eac66d6-f6e9c60194c98e19bf0d98a25f997e346965b892.profdata
diff --git a/chrome/build/android-arm64.pgo.txt b/chrome/build/android-arm64.pgo.txt index aae60ed..4718ccd8 100644 --- a/chrome/build/android-arm64.pgo.txt +++ b/chrome/build/android-arm64.pgo.txt
@@ -1 +1 @@ -chrome-android64-main-1758825782-80414567fdbd58ed870cd753d2d889a55bf05e18-14d608377f1b531d82afc9f8cf81780ce667d33e.profdata +chrome-android64-main-1758849749-5e944251df227dd9fd2a9f28e4b7849ac21ff72a-40536ec79d7b29117543aac3a29c3919a54660bc.profdata
diff --git a/chrome/build/android-desktop-x64.pgo.txt b/chrome/build/android-desktop-x64.pgo.txt index c0e78661..88e656c 100644 --- a/chrome/build/android-desktop-x64.pgo.txt +++ b/chrome/build/android-desktop-x64.pgo.txt
@@ -1 +1 @@ -chrome-android-desktop-x64-main-1758823188-6e737d9fe402855bb71e72287f5d27680302eafd-4390848015957f42af7b44583fb3546d877dd0fe.profdata +chrome-android-desktop-x64-main-1758866082-16e3d2d42334928e6d7f22ff9d9bd3f8842ece15-f6e9c60194c98e19bf0d98a25f997e346965b892.profdata
diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt index 7cad35b..1332894 100644 --- a/chrome/build/mac-arm.pgo.txt +++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@ -chrome-mac-arm-main-1758837514-e1896484fb8cfe48b3b6745bf747de64042182a6-d70d1d6a7aa0eb2e4a57c05797f535a620d6098e.profdata +chrome-mac-arm-main-1758866082-cd64dd224d20a46943591037dbc0ffbd76f8790e-f6e9c60194c98e19bf0d98a25f997e346965b892.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 605f7d0..1cfcd9f8 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@ -chrome-mac-main-1758823188-6cf8f6df10bca7d138112ee4ca4e7db7841a84d3-4390848015957f42af7b44583fb3546d877dd0fe.profdata +chrome-mac-main-1758844681-67386715ca4f45612a51d15eca7f405057965522-cb37e57bbc308979e611a16e766617becb7d88ee.profdata
diff --git a/chrome/build/win-arm64.pgo.txt b/chrome/build/win-arm64.pgo.txt index 7ea2e72..2c5315a 100644 --- a/chrome/build/win-arm64.pgo.txt +++ b/chrome/build/win-arm64.pgo.txt
@@ -1 +1 @@ -chrome-win-arm64-main-1758823188-487de300a0a28502bb8f206e6efccb5692a14955-4390848015957f42af7b44583fb3546d877dd0fe.profdata +chrome-win-arm64-main-1758844681-0022566591801490467fae70fc26dafecc01d7c8-cb37e57bbc308979e611a16e766617becb7d88ee.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index fa6e526..2d4663f 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1758812140-e3d8ef979308635017a373714b982f3461a70ed8-073f64b7bc11cbfba98426ef975c1a74f4afae28.profdata +chrome-win32-main-1758855354-6ac655027b571e5cad18939a1c7ffd16babdfa02-ec56c443b711d9d2ece93b672095b6607c54fec5.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index f87f6f31..5ab926b 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@ -chrome-win64-main-1758812140-f14c6c3d8647897d754d5886c98c6fd765d5cb86-073f64b7bc11cbfba98426ef975c1a74f4afae28.profdata +chrome-win64-main-1758833983-68b3e696cecebcdcb767539b3830aec861198962-7499615ba103a5665f1df5180f134e252f987363.profdata
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc index 162d2aa..d421d88 100644 --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc
@@ -722,6 +722,10 @@ &kGlicCaaGuestError, "glic-caa-link-url", "https://gemini.google.com/"}; extern const base::FeatureParam<std::string> kGlicCaaLinkText{ &kGlicCaaGuestError, "glic-caa-link-text", "gemini.google.com"}; +extern const base::FeatureParam<std::string> kGlicCaaGuestRedirectPatterns{ + &kGlicCaaGuestError, "glic-caa-redirect-patterns", + "https://access.workspace.google.com https://admin.google.com " + "https://accounts.google.com/info/servicerestricted"}; BASE_FEATURE(kGlicEntrypointVariations, base::FEATURE_DISABLED_BY_DEFAULT); const base::FeatureParam<bool> kGlicEntrypointVariationsShowLabel{
diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h index 9c8c7dd..cee18bc 100644 --- a/chrome/common/chrome_features.h +++ b/chrome/common/chrome_features.h
@@ -523,6 +523,8 @@ extern const base::FeatureParam<std::string> kGlicCaaLinkUrl; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<std::string> kGlicCaaLinkText; +COMPONENT_EXPORT(CHROME_FEATURES) +extern const base::FeatureParam<std::string> kGlicCaaGuestRedirectPatterns; COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kGlicEntrypointVariations); @@ -533,7 +535,6 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kGlicExtensions); - COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kGlicHeader); COMPONENT_EXPORT(CHROME_FEATURES)
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index e6cb4af..89ca789 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc
@@ -969,12 +969,17 @@ "glic-skip-reload-after-navigation"; // Whether additional logging is enabled in the glic api host. const char kGlicHostLogging[] = "glic-host-logging"; + +// List of URL patterns in the glic webview to redirect to an admin blocked +// panel, as a space-separated list. +const char kGlicAdminRedirectPatterns[] = "glic-admin-redirect-patterns"; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) // Writes open and installed web apps for each profile to the specified file -// without launching a new browser window or tab. Pass a absolute file path to -// specify where to output the information. Can be used together with optional +// without launching a new browser window or tab. Pass a absolute file path +// to specify where to output the information. Can be used together with +// optional // --profile-base-name switch to only write information for a given profile. const char kListApps[] = "list-apps";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index f53de90..6b8b342 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h
@@ -302,6 +302,7 @@ extern const char kGlicDev[]; extern const char kGlicSkipReloadAfterNavigation[]; extern const char kGlicHostLogging[]; +extern const char kGlicAdminRedirectPatterns[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 30ec67a..33fe0a10 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -1906,6 +1906,7 @@ "//chrome/browser/touch_to_fill/password_manager/password_generation/android:public", "//chrome/browser/ui:ui_features", "//chrome/browser/ui/android/hats:browser_tests", + "//chrome/browser/ui/extensions", "//chrome/browser/ui/hats", "//chrome/browser/ui/plus_addresses:browser_tests", "//chrome/browser/ui/tabs:tab_enums", @@ -1945,6 +1946,7 @@ "//components/invalidation:test_support", "//components/messages/android", "//components/messages/android:feature_flags", + "//components/messages/android:test_support", "//components/messages/android/test:test_support_cpp", "//components/messages/android/test:test_support_java", "//components/metrics:content", @@ -2140,6 +2142,7 @@ "../browser/extensions/api/omnibox/omnibox_api_interactive_test.cc", "../browser/extensions/api/tabs/tabs_apitest_android.cc", "../browser/extensions/desktop_android_extensions_browsertest.cc", + "../browser/ui/extensions/reload_page_dialog_controller_android_browsertest.cc", ] deps += [ @@ -4756,6 +4759,7 @@ "../browser/page_load_metrics/observers/serp_page_load_metrics_observer_browsertest.cc", "../browser/safe_browsing/extension_telemetry/extension_telemetry_service_browsertest.cc", "../browser/supervised_user/desktop/supervised_user_extension_browsertest.cc", + "../browser/supervised_user/extension_icon_loader_browsertest.cc", "../browser/supervised_user/extensions_interactive_uitest.cc", "../browser/ui/views/autofill/popup/custom_cursor_suppressor_browsertest.cc", "../browser/ui/views/user_education/recent_session_observer_impl_browsertest.cc", @@ -9307,7 +9311,6 @@ "../browser/extensions/forced_extensions/force_installed_test_base.cc", "../browser/extensions/forced_extensions/force_installed_test_base.h", "../browser/extensions/forced_extensions/force_installed_tracker_unittest.cc", - "../browser/extensions/install_tracker_unittest.cc", "../browser/extensions/install_verifier_unittest.cc", "../browser/extensions/installed_loader_unittest.cc", "../browser/extensions/permissions/active_tab_unittest.cc", @@ -9497,7 +9500,6 @@ "../browser/renderer_context_menu/context_menu_content_type_unittest.cc", "../browser/safe_browsing/test_extension_event_observer.cc", "../browser/safe_browsing/test_extension_event_observer.h", - "../browser/supervised_user/extension_icon_loader_unittest.cc", "../browser/supervised_user/supervised_user_extension_unittest.cc", "../browser/supervised_user/supervised_user_extensions_manager_unittest.cc", "../browser/supervised_user/supervised_user_url_filter_extensions_unittest.cc",
diff --git a/chrome/test/chromeos/autotest/README.chromium b/chrome/test/chromeos/autotest/README.chromium index a273c63..85e622b 100644 --- a/chrome/test/chromeos/autotest/README.chromium +++ b/chrome/test/chromeos/autotest/README.chromium
@@ -1,6 +1,6 @@ Name: Test code URL: https://chromium.googlesource.com/chromiumos/third_party/autotest/+/refs/heads/master/docs/user-doc.md -Update Mechanism: Static (crbug.com/422060572) +Update Mechanism: Static (https://crbug.com/422060572) License: BSD-3-Clause Security Critical: no Shipped: no
diff --git a/chrome/test/data/webui/settings/autofill_page_test.ts b/chrome/test/data/webui/settings/autofill_page_test.ts index b2f0785..6e1f825 100644 --- a/chrome/test/data/webui/settings/autofill_page_test.ts +++ b/chrome/test/data/webui/settings/autofill_page_test.ts
@@ -11,9 +11,8 @@ import {flushTasks} from 'chrome://webui-test/polymer_test_util.js'; import type {SettingsAutofillSectionElement, SettingsPaymentsSectionElement} from 'chrome://settings/lazy_load.js'; import {AutofillManagerImpl, PaymentsManagerImpl} from 'chrome://settings/lazy_load.js'; -import {resetRouterForTesting} from 'chrome://settings/settings.js'; import type {CrLinkRowElement, SettingsAutofillPageElement, SettingsPrefsElement} from 'chrome://settings/settings.js'; -import {CrSettingsPrefs, OpenWindowProxyImpl, PasswordManagerImpl, SettingsPluralStringProxyImpl, PasswordManagerPage} from 'chrome://settings/settings.js'; +import {AutofillSettingsReferrer, CrSettingsPrefs, MetricsBrowserProxyImpl, OpenWindowProxyImpl, PasswordManagerImpl, PasswordManagerPage, resetRouterForTesting, SettingsPluralStringProxyImpl} from 'chrome://settings/settings.js'; import {assertEquals, assertDeepEquals, assertTrue} from 'chrome://webui-test/chai_assert.js'; import {FakeSettingsPrivate} from 'chrome://webui-test/fake_settings_private.js'; import {TestPluralStringProxy} from 'chrome://webui-test/test_plural_string_proxy.js'; @@ -21,22 +20,23 @@ import {AutofillManagerExpectations, createAddressEntry, createCreditCardEntry, createIbanEntry, createPayOverTimeIssuerEntry, PaymentsManagerExpectations, STUB_USER_ACCOUNT_INFO, TestAutofillManager, TestPaymentsManager} from './autofill_fake_data.js'; import {TestPasswordManagerProxy} from './test_password_manager_proxy.js'; +import {TestMetricsBrowserProxy} from './test_metrics_browser_proxy.js'; // clang-format on -suite('PasswordsAndForms', function() { - /** - * Creates a new passwords and forms element. - */ - function createAutofillElement(prefsElement: SettingsPrefsElement): - SettingsAutofillPageElement { - const element = document.createElement('settings-autofill-page'); - element.prefs = prefsElement.prefs; - document.body.appendChild(element); - flush(); - return element; - } +/** + * Creates a new passwords and forms element. + */ +function createAutofillElement(prefsElement: SettingsPrefsElement): + SettingsAutofillPageElement { + const element = document.createElement('settings-autofill-page'); + element.prefs = prefsElement.prefs; + document.body.appendChild(element); + flush(); + return element; +} +suite('PasswordsAndForms', function() { function createPaymentSectionElement(prefsElement: SettingsPrefsElement) { const element = document.createElement('settings-payments-section'); element.prefs = prefsElement.prefs!; @@ -329,3 +329,77 @@ assertEquals(PasswordManagerPage.PASSWORDS, param); }); }); + +suite('AutofillPageMetricsTest', function() { + let autofillPage: SettingsAutofillPageElement; + let metricsBrowserProxy: TestMetricsBrowserProxy; + + setup(function() { + document.body.innerHTML = window.trustedTypes!.emptyHTML; + metricsBrowserProxy = new TestMetricsBrowserProxy(); + MetricsBrowserProxyImpl.setInstance(metricsBrowserProxy); + loadTimeData.overrideValues({ + showAutofillAiControl: false, + }); + resetRouterForTesting(); + + autofillPage = document.createElement('settings-autofill-page'); + document.body.appendChild(autofillPage); + return flushTasks(); + }); + + test('recordMetricsWhenClickingAddresses', async function() { + const addressesManagerButton = + autofillPage.shadowRoot!.querySelector<HTMLElement>( + '#addressesManagerButton'); + assertTrue(!!addressesManagerButton); + addressesManagerButton.click(); + + const [histogramName, referrer] = await metricsBrowserProxy.whenCalled( + 'recordAutofillSettingsReferrer'); + assertEquals('Autofill.AddressesSettingsPage.VisitReferrer', histogramName); + assertEquals( + AutofillSettingsReferrer.AUTOFILL_AND_PASSWORDS_PAGE, referrer); + }); + + test('recordMetricsWhenClickingPayments', async function() { + const paymentManagerButton = + autofillPage.shadowRoot!.querySelector<HTMLElement>( + '#paymentManagerButton'); + assertTrue(!!paymentManagerButton); + paymentManagerButton.click(); + + const [histogramName, referrer] = await metricsBrowserProxy.whenCalled( + 'recordAutofillSettingsReferrer'); + assertEquals('Autofill.PaymentMethodsSettingsPage.VisitReferrer', + histogramName); + assertEquals( + AutofillSettingsReferrer.AUTOFILL_AND_PASSWORDS_PAGE, referrer); + }); + + test('recordMetricsWhenClickingAutofillAi', async function() { + loadTimeData.overrideValues({ + showAutofillAiControl: true, + }); + resetRouterForTesting(); + + document.body.innerHTML = window.trustedTypes!.emptyHTML; + const prefs = document.createElement('settings-prefs'); + autofillPage = createAutofillElement(prefs); + autofillPage = document.createElement('settings-autofill-page'); + document.body.appendChild(autofillPage); + await flushTasks(); + + const autofillAiManagerButton = + autofillPage.shadowRoot!.querySelector<HTMLElement>( + '#autofillAiManagerButton'); + assertTrue(!!autofillAiManagerButton); + autofillAiManagerButton.click(); + + const [histogramName, referrer] = await metricsBrowserProxy.whenCalled( + 'recordAutofillSettingsReferrer'); + assertEquals('Autofill.FormsAiSettingsPage.VisitReferrer', histogramName); + assertEquals( + AutofillSettingsReferrer.AUTOFILL_AND_PASSWORDS_PAGE, referrer); + }); +});
diff --git a/chrome/test/data/webui/settings/settings_menu_test.ts b/chrome/test/data/webui/settings/settings_menu_test.ts index faf66a4..bac8a9f 100644 --- a/chrome/test/data/webui/settings/settings_menu_test.ts +++ b/chrome/test/data/webui/settings/settings_menu_test.ts
@@ -7,7 +7,7 @@ // clang-format off import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import type {SettingsMenuElement, SettingsRoutes} from 'chrome://settings/settings.js'; -import {resetRouterForTesting, loadTimeData, MetricsBrowserProxyImpl, resetPageVisibilityForTesting, Router} from 'chrome://settings/settings.js'; +import {AutofillSettingsReferrer, resetRouterForTesting, loadTimeData, MetricsBrowserProxyImpl, resetPageVisibilityForTesting, Router} from 'chrome://settings/settings.js'; import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; import {isVisible, microtasksFinished} from 'chrome://webui-test/test_util.js'; import {flushTasks} from 'chrome://webui-test/polymer_test_util.js'; @@ -179,6 +179,24 @@ assertEquals(routes.AI, Router.getInstance().getCurrentRoute()); }); + test('autofillPageMenuClick', async function() { + const entry = settingsMenu.shadowRoot!.querySelector<HTMLElement>( + 'a[href=\'/autofill\']'); + assertTrue(!!entry); + assertTrue(isVisible(entry)); + + entry.click(); + const [histogramName, referrer] = await metricsBrowserProxy.whenCalled( + 'recordAutofillSettingsReferrer'); + assertEquals( + 'Autofill.AutofillAndPasswordsSettingsPage.VisitReferrer', + histogramName); + assertEquals(AutofillSettingsReferrer.SETTINGS_MENU, referrer); + + await microtasksFinished(); + assertEquals(routes.AUTOFILL, Router.getInstance().getCurrentRoute()); + }); + test('yourSavedInfoHiddenWhenFeatureDisabled', async function() { loadTimeData.overrideValues({enableYourSavedInfoSettingsPage: false}); resetRouterForTesting();
diff --git a/chrome/test/data/webui/settings/test_metrics_browser_proxy.ts b/chrome/test/data/webui/settings/test_metrics_browser_proxy.ts index d677430..a8a2360 100644 --- a/chrome/test/data/webui/settings/test_metrics_browser_proxy.ts +++ b/chrome/test/data/webui/settings/test_metrics_browser_proxy.ts
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import type {AiPageCompareInteractions, AiPageComposeInteractions, AiPageHistorySearchInteractions, AiPageInteractions, AiPageTabOrganizationInteractions, DeleteBrowsingDataAction, MetricsBrowserProxy, PrivacyElementInteractions, PrivacyGuideInteractions, PrivacyGuideSettingsStates, PrivacyGuideStepsEligibleAndReached, SafeBrowsingInteractions, SafetyCheckNotificationsModuleInteractions, SafetyCheckUnusedSitePermissionsModuleInteractions, SafetyHubCardState, SafetyHubEntryPoint, SafetyHubModuleType, SafetyHubSurfaces} from 'chrome://settings/settings.js'; +import type {AiPageCompareInteractions, AiPageComposeInteractions, AiPageHistorySearchInteractions, AiPageInteractions, AiPageTabOrganizationInteractions, AutofillSettingsReferrer, DeleteBrowsingDataAction, MetricsBrowserProxy, PrivacyElementInteractions, PrivacyGuideInteractions, PrivacyGuideSettingsStates, PrivacyGuideStepsEligibleAndReached, SafeBrowsingInteractions, SafetyCheckNotificationsModuleInteractions, SafetyCheckUnusedSitePermissionsModuleInteractions, SafetyHubCardState, SafetyHubEntryPoint, SafetyHubModuleType, SafetyHubSurfaces} from 'chrome://settings/settings.js'; import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js'; export class TestMetricsBrowserProxy extends TestBrowserProxy implements @@ -39,6 +39,7 @@ 'recordAiPageCompareInteractions', 'recordAiPageComposeInteractions', 'recordAiPageTabOrganizationInteractions', + 'recordAutofillSettingsReferrer', ]); } @@ -50,6 +51,12 @@ this.methodCalled('recordBooleanHistogram', [histogramName, visible]); } + recordAutofillSettingsReferrer( + histogramName: string, referrer: AutofillSettingsReferrer) { + this.methodCalled( + 'recordAutofillSettingsReferrer', [histogramName, referrer]); + } + recordSettingsPageHistogram(interaction: PrivacyElementInteractions) { this.methodCalled('recordSettingsPageHistogram', interaction); }
diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM index 32b9ce0b..4668a5a 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM
@@ -1 +1 @@ -16429.0.0-1071965 \ No newline at end of file +16429.0.0-1071977 \ No newline at end of file
diff --git a/chromeos/components/magic_boost/public/cpp/magic_boost_state.cc b/chromeos/components/magic_boost/public/cpp/magic_boost_state.cc index a0e9f85b..94e457e 100644 --- a/chromeos/components/magic_boost/public/cpp/magic_boost_state.cc +++ b/chromeos/components/magic_boost/public/cpp/magic_boost_state.cc
@@ -137,4 +137,20 @@ } } +std::ostream& operator<<(std::ostream& os, HMRConsentStatus status) { + switch (status) { + case HMRConsentStatus::kApproved: + return os << "kApproved"; + case HMRConsentStatus::kDeclined: + return os << "kDeclined"; + case HMRConsentStatus::kPendingDisclaimer: + return os << "kPendingDisclaimer"; + case HMRConsentStatus::kUnset: + return os << "kUnset"; + } + + CHECK(false) << "Invalid HMRConsentStatus enum class value provided: " + << static_cast<int>(status); +} + } // namespace chromeos
diff --git a/chromeos/components/magic_boost/public/cpp/magic_boost_state.h b/chromeos/components/magic_boost/public/cpp/magic_boost_state.h index dcc07e5..7184f391 100644 --- a/chromeos/components/magic_boost/public/cpp/magic_boost_state.h +++ b/chromeos/components/magic_boost/public/cpp/magic_boost_state.h
@@ -40,7 +40,38 @@ kUnset = 3, }; +COMPONENT_EXPORT(MAGIC_BOOST) +std::ostream& operator<<(std::ostream& os, HMRConsentStatus status); + // A class that holds MagicBoost related prefs and states. +// +// ## Magic Boost prefs model +// +// The table below shows the behavior of the HMR feature based on its three +// main preference values. Other features should follow the same logic. +// +// Note that this model is different from Quick Answers prefs model. Refer +// `quick_answers_state.h` for its prefs model. QuickAnswersState is a class to +// abstract these differences for Quick Answers code base. +// +// | magic_boost_enabled | hmr_enabled | consent_status | HMR Behavior | +// |:--------------------|:---------------|:-------------------|:-------------| +// | false | false | kUnset | Disabled | +// | false | false | kPendingDisclaimer | Disabled | +// | false | false | kApproved | Disabled | +// | false | false | kDeclined | Disabled | +// | false | true | kUnset | Disabled | +// | false | true | kPendingDisclaimer | Disabled | +// | false | true | kApproved | Disabled | +// | false | true | kDeclined | Disabled | +// | true | false | kUnset | Disabled | +// | true | false | kPendingDisclaimer | Disabled | +// | true | false | kApproved | Disabled | +// | true | false | kDeclined | Disabled | +// | true (default) | true (default) | kUnset (default) | Show consent | +// | true | true | kPendingDisclaimer | Show consent | +// | true | true | kApproved | Show HMR | +// | true | true | kDeclined | Disabled | class COMPONENT_EXPORT(MAGIC_BOOST) MagicBoostState { public: // A checked observer which receives MagicBoost state changes.
diff --git a/chromeos/components/quick_answers/public/cpp/quick_answers_state.cc b/chromeos/components/quick_answers/public/cpp/quick_answers_state.cc index 07ba34b..3b06f73a 100644 --- a/chromeos/components/quick_answers/public/cpp/quick_answers_state.cc +++ b/chromeos/components/quick_answers/public/cpp/quick_answers_state.cc
@@ -15,6 +15,7 @@ #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" #include "base/types/expected.h" +#include "base/types/expected_macros.h" #include "chromeos/components/kiosk/kiosk_utils.h" #include "chromeos/components/magic_boost/public/cpp/magic_boost_state.h" #include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h" @@ -41,16 +42,21 @@ NOTREACHED() << "Unknown MagicBoostState::Error enum class value provided."; } -quick_answers::prefs::ConsentStatus ToQuickAnswersPrefsConsentStatus( - chromeos::HMRConsentStatus consent_status) { - switch (consent_status) { +quick_answers::prefs::ConsentStatus ToQuickAnswersStateConsentStatus( + bool magic_boost_enabled, + bool hmr_enabled, + chromeos::HMRConsentStatus hmr_consent_status) { + if (!magic_boost_enabled || !hmr_enabled) { + return quick_answers::prefs::ConsentStatus::kRejected; + } + + switch (hmr_consent_status) { case chromeos::HMRConsentStatus::kUnset: - return quick_answers::prefs::ConsentStatus::kUnknown; case chromeos::HMRConsentStatus::kPendingDisclaimer: - // Quick Answers capability is available from `kPendingDisclaimer` state. - // See comments in `chromeos::HMRConsentStatus` for details of those - // states. - return quick_answers::prefs::ConsentStatus::kAccepted; + // Quick Answers capability is NOT available from `kPendingDisclaimer` + // state. See comments in `chromeos::HMRConsentStatus` for details of + // those states. + return quick_answers::prefs::ConsentStatus::kUnknown; case chromeos::HMRConsentStatus::kApproved: return quick_answers::prefs::ConsentStatus::kAccepted; case chromeos::HMRConsentStatus::kDeclined: @@ -65,14 +71,6 @@ return is_enabled.transform_error(&ToQuickAnswersStateError); } -base::expected<quick_answers::prefs::ConsentStatus, QuickAnswersState::Error> -ToQuickAnswersStateConsentStatus( - base::expected<chromeos::HMRConsentStatus, chromeos::MagicBoostState::Error> - consent_status) { - return consent_status.transform_error(&ToQuickAnswersStateError) - .transform(&ToQuickAnswersPrefsConsentStatus); -} - } // namespace // static @@ -356,13 +354,26 @@ return base::unexpected(QuickAnswersState::Error::kUninitialized); } - return ToQuickAnswersStateConsentStatus( - magic_boost_state->hmr_consent_status()); + ASSIGN_OR_RETURN(bool magic_boost_enabled_value, + magic_boost_state->magic_boost_enabled(), + &ToQuickAnswersStateError); + ASSIGN_OR_RETURN(bool hmr_enabled_value, magic_boost_state->hmr_enabled(), + &ToQuickAnswersStateError); + ASSIGN_OR_RETURN(chromeos::HMRConsentStatus hmr_consent_status_value, + magic_boost_state->hmr_consent_status(), + &ToQuickAnswersStateError); + + return ToQuickAnswersStateConsentStatus(magic_boost_enabled_value, + hmr_enabled_value, + hmr_consent_status_value); } case QuickAnswersState::FeatureType::kQuickAnswers: { return quick_answers_consent_status_; } } + + NOTREACHED() << "Invalid FeatureType provided: " + << static_cast<int>(feature_type); } base::expected<bool, QuickAnswersState::Error>
diff --git a/chromeos/components/quick_answers/public/cpp/quick_answers_state.h b/chromeos/components/quick_answers/public/cpp/quick_answers_state.h index c165dc2..d96f9fc 100644 --- a/chromeos/components/quick_answers/public/cpp/quick_answers_state.h +++ b/chromeos/components/quick_answers/public/cpp/quick_answers_state.h
@@ -66,6 +66,42 @@ // Answers capabpility. // - Hmr feature: a feature called Hmr. It provides Mahi and Quick Answers // capability. +// +// ## Quick Answers pref model +// +// The table below shows the behavior of the Quick Answers feature based on its +// two main preferences. +// +// | Enabled | Consent Status | Behavior | +// |:----------------|:---------------------|:-----------------| +// | false (default) | `kUnknown` (default) | Shows consent UI | +// | false | `kAccepted` | Disabled | +// | false | `kRejected` | Disabled | +// | true | `kUnknown` | N/A | +// | true | `kAccepted` | Shows QA UI | +// | true | `kRejected` | N/A | +// +// ## Pref model differences between Quick Answers and Magic Boost +// +// Quick Answers feature and Hmr feature have different pref values model and +// default values. +// +// For Quick Answers, `kQuickAnswersEnabled` is false by default, and +// `kQuickAnswersConsentStatus` is `kUnknown`. The consent UI is triggered when +// the feature is not enabled and the consent status is `kUnknown`. The feature +// UI is shown when the feature is enabled. +// +// For Magic Boost (HMR), `kHmrEnabled` is true by default, but the +// `kHMRConsentStatus` is `kUnset`. This blocks the feature from being provided +// initially. The consent UI is triggered when HMR is enabled but the consent is +// not approved. The feature UI is shown only when HMR is enabled and the +// consent has been approved. +// +// Read `magic_boost_state.h` for details of its pref model. +// +// `QuickAnswersState` works as an abstraction layer. All Quick Answers code +// expects the above Quick Answers pref value model even if it's running as part +// of HMR. class QuickAnswersState : chromeos::MagicBoostState::Observer { public: enum class FeatureType {
diff --git a/chromeos/components/quick_answers/public/cpp/quick_answers_state_unittest.cc b/chromeos/components/quick_answers/public/cpp/quick_answers_state_unittest.cc index 7a2b216..9ccc219 100644 --- a/chromeos/components/quick_answers/public/cpp/quick_answers_state_unittest.cc +++ b/chromeos/components/quick_answers/public/cpp/quick_answers_state_unittest.cc
@@ -8,6 +8,8 @@ #include <string_view> #include "base/functional/callback_forward.h" +#include "base/strings/stringprintf.h" +#include "base/strings/to_string.h" #include "base/test/scoped_feature_list.h" #include "base/types/expected.h" #include "chromeos/components/kiosk/kiosk_test_utils.h" @@ -22,6 +24,7 @@ #include "testing/gtest/include/gtest/gtest.h" namespace quick_answers { + namespace { class FakeObserver : public QuickAnswersStateObserver { @@ -67,6 +70,26 @@ } // namespace +struct PrefsConversionTestCase { + static std::string ToVariantName( + const testing::TestParamInfo<PrefsConversionTestCase>& info) { + return base::StringPrintf( + "MagicBoost%sHmr%s%s", (info.param.magic_boost_enabled ? "On" : "Off"), + (info.param.hmr_enabled ? "On" : "Off"), + base::ToString(info.param.hmr_consent_status).c_str()); + } + + bool magic_boost_enabled; + bool hmr_enabled; + chromeos::HMRConsentStatus hmr_consent_status; + bool expected_quick_answers_enabled; + quick_answers::prefs::ConsentStatus expected_consent_status; +}; + +class QuickAnswersStatePrefsConversionTest + : public QuickAnswersStateWithMagicBoostTest, + public testing::WithParamInterface<PrefsConversionTestCase> {}; + TEST(QuickAnswersStateTest, IsEligible) { FakeQuickAnswersState quick_answers_state; FakeObserver observer; @@ -193,6 +216,8 @@ TEST_F(QuickAnswersStateWithMagicBoostTest, IsEnabledUnderMagicBoost) { chromeos::test::FakeMagicBoostState magic_boost_state; magic_boost_state.SetAvailability(true); + magic_boost_state.SetMagicBoostEnabled(true); + FakeQuickAnswersState quick_answers_state; quick_answers_state.SetApplicationLocale("en"); quick_answers_state.SetSettingsEnabled(true); @@ -273,11 +298,16 @@ TEST_F(QuickAnswersStateWithMagicBoostTest, GetConsentStatusUnderMagicBoost) { chromeos::test::FakeMagicBoostState magic_boost_state; + magic_boost_state.SetMagicBoostEnabled(true); magic_boost_state.SetAvailability(true); + magic_boost_state.AsyncWriteHMREnabled(true); + FakeObserver observer; FakeQuickAnswersState quick_answers_state; quick_answers_state.AddObserver(&observer); quick_answers_state.SetApplicationLocale("en"); + ASSERT_EQ(QuickAnswersState::FeatureType::kHmr, + QuickAnswersState::GetFeatureType()); EXPECT_EQ(base::unexpected(QuickAnswersState::Error::kUninitialized), QuickAnswersState::GetConsentStatus()); @@ -306,10 +336,10 @@ magic_boost_state.AsyncWriteConsentStatus( chromeos::HMRConsentStatus::kPendingDisclaimer); - EXPECT_TRUE( + EXPECT_FALSE( quick_answers_state.IsEnabledAs(QuickAnswersState::FeatureType::kHmr)) - << "Quick Answers capability can be enabled with kPendingDisclaimer " - "state."; + << "Quick Answers capability should not be enabled with " + "kPendingDisclaimer state."; EXPECT_FALSE(quick_answers_state.IsEnabledAs( QuickAnswersState::FeatureType::kQuickAnswers)) << "Expect that Quick Answers capability is enabled only as HMR if it's " @@ -434,4 +464,94 @@ "value in kQuickAnswers"; } +TEST_P(QuickAnswersStatePrefsConversionTest, TestPrefsConversion) { + const PrefsConversionTestCase& test_case = GetParam(); + + chromeos::test::FakeMagicBoostState magic_boost_state; + magic_boost_state.SetAvailability(true); + magic_boost_state.SetMagicBoostEnabled(test_case.magic_boost_enabled); + FakeQuickAnswersState quick_answers_state; + quick_answers_state.SetApplicationLocale("en"); + + magic_boost_state.AsyncWriteHMREnabled(test_case.hmr_enabled); + magic_boost_state.AsyncWriteConsentStatus(test_case.hmr_consent_status); + + EXPECT_EQ( + test_case.expected_quick_answers_enabled, + QuickAnswersState::IsEnabledAs(QuickAnswersState::FeatureType::kHmr)); + EXPECT_EQ(test_case.expected_consent_status, + QuickAnswersState::GetConsentStatusAs( + QuickAnswersState::FeatureType::kHmr)); +} + +INSTANTIATE_TEST_SUITE_P( + All, + QuickAnswersStatePrefsConversionTest, + testing::Values( + PrefsConversionTestCase{ + .magic_boost_enabled = true, + .hmr_enabled = false, + .hmr_consent_status = chromeos::HMRConsentStatus::kUnset, + .expected_quick_answers_enabled = false, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kRejected}, + PrefsConversionTestCase{ + .magic_boost_enabled = true, + .hmr_enabled = false, + .hmr_consent_status = chromeos::HMRConsentStatus::kApproved, + .expected_quick_answers_enabled = false, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kRejected}, + PrefsConversionTestCase{ + .magic_boost_enabled = true, + .hmr_enabled = true, + .hmr_consent_status = chromeos::HMRConsentStatus::kUnset, + .expected_quick_answers_enabled = false, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kUnknown}, + PrefsConversionTestCase{ + .magic_boost_enabled = true, + .hmr_enabled = true, + .hmr_consent_status = + chromeos::HMRConsentStatus::kPendingDisclaimer, + .expected_quick_answers_enabled = false, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kUnknown}, + PrefsConversionTestCase{ + .magic_boost_enabled = true, + .hmr_enabled = true, + .hmr_consent_status = chromeos::HMRConsentStatus::kApproved, + .expected_quick_answers_enabled = true, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kAccepted}, + PrefsConversionTestCase{ + .magic_boost_enabled = true, + .hmr_enabled = true, + .hmr_consent_status = chromeos::HMRConsentStatus::kDeclined, + .expected_quick_answers_enabled = false, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kRejected}, + PrefsConversionTestCase{ + .magic_boost_enabled = false, + .hmr_enabled = false, + .hmr_consent_status = chromeos::HMRConsentStatus::kUnset, + .expected_quick_answers_enabled = false, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kRejected}, + PrefsConversionTestCase{ + .magic_boost_enabled = false, + .hmr_enabled = true, + .hmr_consent_status = chromeos::HMRConsentStatus::kApproved, + .expected_quick_answers_enabled = false, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kRejected}, + PrefsConversionTestCase{ + .magic_boost_enabled = false, + .hmr_enabled = true, + .hmr_consent_status = chromeos::HMRConsentStatus::kUnset, + .expected_quick_answers_enabled = false, + .expected_consent_status = + quick_answers::prefs::ConsentStatus::kRejected}), + &PrefsConversionTestCase::ToVariantName); + } // namespace quick_answers
diff --git a/clank b/clank index 88a7eab..238c71a 160000 --- a/clank +++ b/clank
@@ -1 +1 @@ -Subproject commit 88a7eab10da63729eb92d27460d680cdf904c6d3 +Subproject commit 238c71a829afdc31a403a0d5d6cfb29c78fe49ca
diff --git a/components/autofill/core/browser/metrics/autofill_settings_metrics.h b/components/autofill/core/browser/metrics/autofill_settings_metrics.h index 99411641..d57588f 100644 --- a/components/autofill/core/browser/metrics/autofill_settings_metrics.h +++ b/components/autofill/core/browser/metrics/autofill_settings_metrics.h
@@ -56,6 +56,25 @@ }; // LINT.ThenChange(/tools/metrics/histograms/metadata/autofill/enums.xml:AutofillSyncDisabledReason) +// LINT.IfChange(AutofillSettingsReferrer) +// Enumerates referrers that can trigger a navigation to one of the Autofill +// settings pages. +// +// These values are persisted to logs. Entries should not be renumbered and +// numeric values should never be reused. +enum class AutofillSettingsReferrer { + // Corresponds to the profile chooser menu. + kProfileMenu = 0, + // Corresponds to Chrome's main settings menu. + kSettingsMenu = 1, + // Corresponds to the "Autofill and Passwords" settings page. + kAutofillAndPasswordsPage = 2, + // Corresponds to the dropdown shown when clicking into a form field. + kFillingFlowDropdown = 3, + kMaxValue = kFillingFlowDropdown, +}; +// LINT.ThenChange(/tools/metrics/histograms/metadata/autofill/enums.xml:AutofillSettingsReferrer) + // This should be called each time a page containing forms is loaded. void LogIsAutofillEnabledAtPageLoad( bool enabled,
diff --git a/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendServiceBridge.java b/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendServiceBridge.java index 913693c..ddecadd 100644 --- a/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendServiceBridge.java +++ b/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendServiceBridge.java
@@ -17,8 +17,8 @@ import org.chromium.components.tab_group_sync.LocalTabGroupId; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.Set; /** Implementation of {@link MessagingBackendService} that connects to the native counterpart. */ @@ -65,21 +65,12 @@ } @Override - @SuppressWarnings("NullableOptional") public List<PersistentMessage> getMessagesForTab( - @Nullable EitherTabId tabId, - @Nullable Optional</* @PersistentNotificationType */ Integer> type) { + @Nullable EitherTabId tabId, @PersistentNotificationType int type) { if (mNativeMessagingBackendServiceBridge == 0) { return new ArrayList<>(); } - Integer type_int; - if (type == null || !type.isPresent()) { - type_int = PersistentNotificationType.UNDEFINED; - } else { - type_int = type.get(); - } - int localTabId; if (tabId == null || !tabId.isLocalId()) { localTabId = EitherTabId.INVALID_TAB_ID; @@ -90,25 +81,16 @@ return MessagingBackendServiceBridgeJni.get() .getMessagesForTab( - mNativeMessagingBackendServiceBridge, localTabId, syncTabId, type_int); + mNativeMessagingBackendServiceBridge, localTabId, syncTabId, type); } @Override - @SuppressWarnings("NullableOptional") public List<PersistentMessage> getMessagesForGroup( - @Nullable EitherGroupId groupId, - @Nullable Optional</* @PersistentNotificationType */ Integer> type) { + @Nullable EitherGroupId groupId, @PersistentNotificationType int type) { if (mNativeMessagingBackendServiceBridge == 0) { return new ArrayList<>(); } - Integer type_int; - if (type == null || !type.isPresent()) { - type_int = PersistentNotificationType.UNDEFINED; - } else { - type_int = type.get(); - } - LocalTabGroupId localGroupId; if (groupId == null || !groupId.isLocalId()) { localGroupId = null; @@ -119,26 +101,17 @@ return MessagingBackendServiceBridgeJni.get() .getMessagesForGroup( - mNativeMessagingBackendServiceBridge, localGroupId, syncGroupId, type_int); + mNativeMessagingBackendServiceBridge, localGroupId, syncGroupId, type); } @Override - @SuppressWarnings("NullableOptional") - public List<PersistentMessage> getMessages( - @Nullable Optional</* @PersistentNotificationType */ Integer> type) { + public List<PersistentMessage> getMessages(@PersistentNotificationType int type) { if (mNativeMessagingBackendServiceBridge == 0) { - return new ArrayList<>(); - } - - Integer type_int; - if (type == null || !type.isPresent()) { - type_int = PersistentNotificationType.UNDEFINED; - } else { - type_int = type.get(); + return Collections.emptyList(); } return MessagingBackendServiceBridgeJni.get() - .getMessages(mNativeMessagingBackendServiceBridge, type_int); + .getMessages(mNativeMessagingBackendServiceBridge, type); } @Override @@ -163,18 +136,9 @@ } @Override - @SuppressWarnings("NullableOptional") - public void clearPersistentMessage( - String messageId, @Nullable Optional</* @PersistentNotificationType */ Integer> type) { - Integer type_int; - if (type == null || !type.isPresent()) { - type_int = PersistentNotificationType.UNDEFINED; - } else { - type_int = type.get(); - } - + public void clearPersistentMessage(String messageId, @PersistentNotificationType int type) { MessagingBackendServiceBridgeJni.get() - .clearPersistentMessage(mNativeMessagingBackendServiceBridge, messageId, type_int); + .clearPersistentMessage(mNativeMessagingBackendServiceBridge, messageId, type); } @CalledByNative
diff --git a/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendServiceBridgeUnitTestCompanion.java b/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendServiceBridgeUnitTestCompanion.java index 959f9c6..c332257 100644 --- a/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendServiceBridgeUnitTestCompanion.java +++ b/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendServiceBridgeUnitTestCompanion.java
@@ -14,6 +14,7 @@ import org.jni_zero.CalledByNative; import org.jni_zero.JNINamespace; +import org.jni_zero.JniType; import org.junit.Assert; import org.mockito.ArgumentCaptor; @@ -28,7 +29,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; -import java.util.Optional; import java.util.Set; /** A companion object to the native MessagingBackendServiceBridgeTest. */ @@ -82,13 +82,11 @@ @CalledByNative private void invokeGetMessagesAndVerify( - @PersistentNotificationType int type, int[] expectedCollaborationEvents) { - List<PersistentMessage> messages; - if (type == -1) { - messages = mService.getMessages(Optional.empty()); - } else { - messages = mService.getMessages(Optional.of(type)); - } + @JniType("collaboration::messaging::PersistentNotificationType") + @PersistentNotificationType + int type, + int[] expectedCollaborationEvents) { + List<PersistentMessage> messages = mService.getMessages(type); Assert.assertEquals(expectedCollaborationEvents.length, messages.size()); for (int i = 0; i < expectedCollaborationEvents.length; ++i) { Assert.assertEquals(expectedCollaborationEvents[i], messages.get(i).collaborationEvent); @@ -99,7 +97,9 @@ private void invokeGetMessagesForGroupAndVerify( LocalTabGroupId localGroupId, @Nullable String syncId, - @PersistentNotificationType int type, + @JniType("collaboration::messaging::PersistentNotificationType") + @PersistentNotificationType + int type, int[] expectedCollaborationEvents) { EitherId.EitherGroupId groupId; if (syncId == null) { @@ -107,12 +107,7 @@ } else { groupId = EitherId.EitherGroupId.createSyncId(syncId); } - List<PersistentMessage> messages; - if (type == -1) { - messages = mService.getMessagesForGroup(groupId, Optional.empty()); - } else { - messages = mService.getMessagesForGroup(groupId, Optional.of(type)); - } + List<PersistentMessage> messages = mService.getMessagesForGroup(groupId, type); Assert.assertEquals(expectedCollaborationEvents.length, messages.size()); for (int i = 0; i < expectedCollaborationEvents.length; ++i) { Assert.assertEquals(expectedCollaborationEvents[i], messages.get(i).collaborationEvent); @@ -129,7 +124,9 @@ private void invokeGetMessagesForTabAndVerify( int localTabId, @Nullable String syncId, - @PersistentNotificationType int type, + @JniType("collaboration::messaging::PersistentNotificationType") + @PersistentNotificationType + int type, int[] expectedCollaborationEvents) { EitherId.EitherTabId tabId; if (syncId == null) { @@ -137,12 +134,7 @@ } else { tabId = EitherId.EitherTabId.createSyncId(syncId); } - List<PersistentMessage> messages; - if (type == -1) { - messages = mService.getMessagesForTab(tabId, Optional.empty()); - } else { - messages = mService.getMessagesForTab(tabId, Optional.of(type)); - } + List<PersistentMessage> messages = mService.getMessagesForTab(tabId, type); Assert.assertEquals(expectedCollaborationEvents.length, messages.size()); for (int i = 0; i < expectedCollaborationEvents.length; ++i) { Assert.assertEquals(expectedCollaborationEvents[i], messages.get(i).collaborationEvent); @@ -175,7 +167,7 @@ tgmm.localTabGroupId); Assert.assertEquals("a1b2c3d4-e5f6-7890-1234-567890abcdef", tgmm.syncTabGroupId); Assert.assertEquals("last known group title", tgmm.lastKnownTitle); - Assert.assertEquals(TabGroupColorId.ORANGE, tgmm.lastKnownColor.get().intValue()); + Assert.assertEquals(TabGroupColorId.ORANGE, tgmm.lastKnownColor.intValue()); // TabMessageMetadata. TabMessageMetadata tmm = attribution.tabMetadata; @@ -219,7 +211,7 @@ tgmm.localTabGroupId); Assert.assertEquals("a1b2c3d4-e5f6-7890-1234-567890abcdef", tgmm.syncTabGroupId); Assert.assertEquals("last known group title", tgmm.lastKnownTitle); - Assert.assertEquals(TabGroupColorId.ORANGE, tgmm.lastKnownColor.get().intValue()); + Assert.assertEquals(TabGroupColorId.ORANGE, tgmm.lastKnownColor.intValue()); // TabMessageMetadata of attribution 1. TabMessageMetadata tmm = attribution1.tabMetadata;
diff --git a/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/bridge/ConversionUtils.java b/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/bridge/ConversionUtils.java index 3ece88ea..c433e52 100644 --- a/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/bridge/ConversionUtils.java +++ b/components/collaboration/internal/android/java/src/org/chromium/components/collaboration/messaging/bridge/ConversionUtils.java
@@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.TreeSet; @@ -67,11 +66,8 @@ attribution.tabGroupMetadata.localTabGroupId = localTabGroupId; attribution.tabGroupMetadata.syncTabGroupId = syncTabGroupId; attribution.tabGroupMetadata.lastKnownTitle = lastKnownTabGroupTitle; - if (lastKnownTabGroupColor == -1) { - attribution.tabGroupMetadata.lastKnownColor = Optional.empty(); - } else { - attribution.tabGroupMetadata.lastKnownColor = Optional.of(lastKnownTabGroupColor); - } + attribution.tabGroupMetadata.lastKnownColor = + lastKnownTabGroupColor == -1 ? null : lastKnownTabGroupColor; } if (localTabId != -1 || syncTabId != null
diff --git a/components/collaboration/internal/android/messaging/messaging_backend_service_bridge.cc b/components/collaboration/internal/android/messaging/messaging_backend_service_bridge.cc index 36b1566d..581d7d7 100644 --- a/components/collaboration/internal/android/messaging/messaging_backend_service_bridge.cc +++ b/components/collaboration/internal/android/messaging/messaging_backend_service_bridge.cc
@@ -92,15 +92,11 @@ const base::android::JavaRef<jstring>& j_sync_tab_id, jint j_type) { auto type = static_cast<PersistentNotificationType>(j_type); - std::optional<PersistentNotificationType> type_opt = std::make_optional(type); - if (type == PersistentNotificationType::UNDEFINED) { - type_opt = std::nullopt; - } if (j_local_tab_id != kInvalidTabId) { CHECK(!j_sync_tab_id); tab_groups::LocalTabID tab_id = tab_groups::FromJavaTabId(j_local_tab_id); - auto messages = service_->GetMessagesForTab(tab_id, type_opt); + auto messages = service_->GetMessagesForTab(tab_id, type); return PersistentMessagesToJava(env, messages); } if (j_sync_tab_id) { @@ -108,7 +104,7 @@ std::string sync_tab_id_str = base::android::ConvertJavaStringToUTF8(env, j_sync_tab_id); auto tab_id = base::Uuid::ParseLowercase(sync_tab_id_str); - auto messages = service_->GetMessagesForTab(tab_id, type_opt); + auto messages = service_->GetMessagesForTab(tab_id, type); return PersistentMessagesToJava(env, messages); } @@ -122,17 +118,13 @@ const base::android::JavaRef<jstring>& j_sync_group_id, jint j_type) { auto type = static_cast<PersistentNotificationType>(j_type); - std::optional<PersistentNotificationType> type_opt = std::make_optional(type); - if (type == PersistentNotificationType::UNDEFINED) { - type_opt = std::nullopt; - } if (j_local_group_id) { CHECK(!j_sync_group_id); auto group_id = tab_groups::TabGroupSyncConversionsBridge::FromJavaTabGroupId( env, j_local_group_id); - auto messages = service_->GetMessagesForGroup(group_id, type_opt); + auto messages = service_->GetMessagesForGroup(group_id, type); return PersistentMessagesToJava(env, messages); } if (j_sync_group_id) { @@ -140,7 +132,7 @@ std::string sync_group_id_str = base::android::ConvertJavaStringToUTF8(env, j_sync_group_id); auto group_id = base::Uuid::ParseLowercase(sync_group_id_str); - auto messages = service_->GetMessagesForGroup(group_id, type_opt); + auto messages = service_->GetMessagesForGroup(group_id, type); return PersistentMessagesToJava(env, messages); } @@ -152,11 +144,7 @@ JNIEnv* env, jint j_type) { auto type = static_cast<PersistentNotificationType>(j_type); - std::optional<PersistentNotificationType> type_opt = std::make_optional(type); - if (type == PersistentNotificationType::UNDEFINED) { - type_opt = std::nullopt; - } - auto messages = service_->GetMessages(type_opt); + auto messages = service_->GetMessages(type); return PersistentMessagesToJava(env, messages); } @@ -187,12 +175,7 @@ auto message_id = base::Uuid::ParseLowercase( base::android::ConvertJavaStringToUTF8(env, j_message_id)); auto type = static_cast<PersistentNotificationType>(j_type); - std::optional<PersistentNotificationType> type_opt = std::make_optional(type); - if (type == PersistentNotificationType::UNDEFINED) { - type_opt = std::nullopt; - } - - service_->ClearPersistentMessage(message_id, type_opt); + service_->ClearPersistentMessage(message_id, type); } void MessagingBackendServiceBridge::RunInstantaneousMessageSuccessCallback(
diff --git a/components/collaboration/internal/android/messaging/messaging_backend_service_bridge_unittest.cc b/components/collaboration/internal/android/messaging/messaging_backend_service_bridge_unittest.cc index f50678bf..48b40b0 100644 --- a/components/collaboration/internal/android/messaging/messaging_backend_service_bridge_unittest.cc +++ b/components/collaboration/internal/android/messaging/messaging_backend_service_bridge_unittest.cc
@@ -352,26 +352,23 @@ // First -- All types. // The call should arrive to the service with no type. - std::optional<PersistentNotificationType> all_types = std::nullopt; + PersistentNotificationType all_types = PersistentNotificationType::UNDEFINED; EXPECT_CALL(service(), GetMessages(all_types)).WillOnce(Return(messages)); // Verify that the order of messages stays the same. JNIEnv* env = base::android::AttachCurrentThread(); Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesAndVerify( - env, j_companion(), - /*notification_type=*/-1, + env, j_companion(), PersistentNotificationType::UNDEFINED, PersistentMessagesToCollaborationEventArray(env, messages)); // Next up -- Specific type. // The call should arrive to the service with the correct type. - EXPECT_CALL(service(), - GetMessages(std::make_optional(PersistentNotificationType::CHIP))) + EXPECT_CALL(service(), GetMessages(PersistentNotificationType::CHIP)) .WillOnce(Return(messages)); // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesAndVerify( - env, j_companion(), - /*notification_type=*/static_cast<jint>(PersistentNotificationType::CHIP), + env, j_companion(), PersistentNotificationType::CHIP, PersistentMessagesToCollaborationEventArray(env, messages)); } @@ -387,7 +384,7 @@ env, std::make_optional(local_tab_group_id)); // The call should arrive to the service with no type. - std::optional<PersistentNotificationType> all_types = std::nullopt; + PersistentNotificationType all_types = PersistentNotificationType::UNDEFINED; tab_groups::EitherGroupID group_id(local_tab_group_id); EXPECT_CALL(service(), GetMessagesForGroup(group_id, all_types)) .WillOnce(Return(messages)); @@ -395,21 +392,19 @@ // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesForGroupAndVerify( env, j_companion(), j_local_tab_group_id, nullptr, - /*notification_type=*/-1, + PersistentNotificationType::UNDEFINED, PersistentMessagesToCollaborationEventArray(env, messages)); // Next up -- Specific type. // The call should arrive to the service with the correct type. PersistentNotificationType notification_type = PersistentNotificationType::CHIP; - EXPECT_CALL(service(), GetMessagesForGroup( - group_id, std::make_optional(notification_type))) + EXPECT_CALL(service(), GetMessagesForGroup(group_id, notification_type)) .WillOnce(Return(messages)); // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesForGroupAndVerify( - env, j_companion(), j_local_tab_group_id, nullptr, - /*notification_type=*/static_cast<jint>(notification_type), + env, j_companion(), j_local_tab_group_id, nullptr, notification_type, PersistentMessagesToCollaborationEventArray(env, messages)); } @@ -425,7 +420,7 @@ env, sync_tab_group_id.AsLowercaseString()); // The call should arrive to the service with no type. - std::optional<PersistentNotificationType> all_types = std::nullopt; + PersistentNotificationType all_types = PersistentNotificationType::UNDEFINED; tab_groups::EitherGroupID group_id(sync_tab_group_id); EXPECT_CALL(service(), GetMessagesForGroup(group_id, all_types)) .WillOnce(Return(messages)); @@ -433,21 +428,19 @@ // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesForGroupAndVerify( env, j_companion(), nullptr, j_sync_tab_group_id, - /*notification_type=*/-1, + PersistentNotificationType::UNDEFINED, PersistentMessagesToCollaborationEventArray(env, messages)); // Next up -- Specific type. // The call should arrive to the service with the correct type. PersistentNotificationType notification_type = PersistentNotificationType::CHIP; - EXPECT_CALL(service(), GetMessagesForGroup( - group_id, std::make_optional(notification_type))) + EXPECT_CALL(service(), GetMessagesForGroup(group_id, notification_type)) .WillOnce(Return(messages)); // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesForGroupAndVerify( - env, j_companion(), nullptr, j_sync_tab_group_id, - /*notification_type=*/static_cast<jint>(notification_type), + env, j_companion(), nullptr, j_sync_tab_group_id, notification_type, PersistentMessagesToCollaborationEventArray(env, messages)); } @@ -474,7 +467,7 @@ auto j_local_tab_id = tab_groups::ToJavaTabId(local_tab_id); // The call should arrive to the service with no type. - std::optional<PersistentNotificationType> all_types = std::nullopt; + PersistentNotificationType all_types = PersistentNotificationType::UNDEFINED; tab_groups::EitherTabID tab_id(local_tab_id.value()); EXPECT_CALL(service(), GetMessagesForTab(tab_id, all_types)) .WillOnce(Return(messages)); @@ -482,21 +475,19 @@ // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesForTabAndVerify( env, j_companion(), j_local_tab_id, nullptr, - /*notification_type=*/-1, + PersistentNotificationType::UNDEFINED, PersistentMessagesToCollaborationEventArray(env, messages)); // Next up -- Specific type. // The call should arrive to the service with the correct type. PersistentNotificationType notification_type = PersistentNotificationType::CHIP; - EXPECT_CALL(service(), - GetMessagesForTab(tab_id, std::make_optional(notification_type))) + EXPECT_CALL(service(), GetMessagesForTab(tab_id, notification_type)) .WillOnce(Return(messages)); // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesForTabAndVerify( - env, j_companion(), j_local_tab_id, nullptr, - /*notification_type=*/static_cast<jint>(notification_type), + env, j_companion(), j_local_tab_id, nullptr, notification_type, PersistentMessagesToCollaborationEventArray(env, messages)); } @@ -512,7 +503,7 @@ sync_tab_id.AsLowercaseString()); // The call should arrive to the service with no type. - std::optional<PersistentNotificationType> all_types = std::nullopt; + PersistentNotificationType all_types = PersistentNotificationType::UNDEFINED; tab_groups::EitherTabID tab_id(sync_tab_id); EXPECT_CALL(service(), GetMessagesForTab(tab_id, all_types)) .WillOnce(Return(messages)); @@ -520,21 +511,19 @@ // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesForTabAndVerify( env, j_companion(), -1, j_sync_tab_id, - /*notification_type=*/-1, + PersistentNotificationType::UNDEFINED, PersistentMessagesToCollaborationEventArray(env, messages)); // Next up -- Specific type. // The call should arrive to the service with the correct type. PersistentNotificationType notification_type = PersistentNotificationType::CHIP; - EXPECT_CALL(service(), - GetMessagesForTab(tab_id, std::make_optional(notification_type))) + EXPECT_CALL(service(), GetMessagesForTab(tab_id, notification_type)) .WillOnce(Return(messages)); // Verify that the order of messages stays the same. Java_MessagingBackendServiceBridgeUnitTestCompanion_invokeGetMessagesForTabAndVerify( - env, j_companion(), -1, j_sync_tab_id, - /*notification_type=*/static_cast<jint>(notification_type), + env, j_companion(), -1, j_sync_tab_id, notification_type, PersistentMessagesToCollaborationEventArray(env, messages)); }
diff --git a/components/collaboration/internal/messaging/messaging_backend_service_impl.cc b/components/collaboration/internal/messaging/messaging_backend_service_impl.cc index 7b6672af..9b143cdb 100644 --- a/components/collaboration/internal/messaging/messaging_backend_service_impl.cc +++ b/components/collaboration/internal/messaging/messaging_backend_service_impl.cc
@@ -7,7 +7,6 @@ #include <sys/types.h> #include <memory> -#include <optional> #include <string> #include <unordered_set> #include <vector> @@ -388,22 +387,19 @@ } DirtyType GetDirtyTypeFromPersistentNotificationTypeForQuery( - std::optional<PersistentNotificationType> type) { - if (!type) { - // Ask for all dirty messages. - return DirtyType::kAll; - } - if (*type == PersistentNotificationType::DIRTY_TAB) { - return DirtyType::kDot; - } else if (*type == PersistentNotificationType::CHIP) { - return DirtyType::kChip; - } else if (*type == PersistentNotificationType::TOMBSTONED) { - return DirtyType::kTombstoned; - } else if (*type == PersistentNotificationType::INSTANT_MESSAGE) { - return DirtyType::kMessageOnly; - } else { - // Ask for all dirty messages. - return DirtyType::kAll; + PersistentNotificationType type) { + switch (type) { + case PersistentNotificationType::DIRTY_TAB: + return DirtyType::kDot; + case PersistentNotificationType::CHIP: + return DirtyType::kChip; + case PersistentNotificationType::TOMBSTONED: + return DirtyType::kTombstoned; + case PersistentNotificationType::INSTANT_MESSAGE: + return DirtyType::kMessageOnly; + default: + // Ask for all dirty messages. + return DirtyType::kAll; } } @@ -578,7 +574,7 @@ std::vector<PersistentMessage> MessagingBackendServiceImpl::GetMessagesForTab( tab_groups::EitherTabID tab_id, - std::optional<PersistentNotificationType> type) { + PersistentNotificationType type) { std::optional<tab_groups::SavedTabGroupTab> tab = GetTabFromTabId(tab_id); if (!tab) { // Unable to find tab. @@ -614,7 +610,7 @@ std::vector<PersistentMessage> MessagingBackendServiceImpl::GetMessagesForGroup( tab_groups::EitherGroupID group_id, - std::optional<PersistentNotificationType> type) { + PersistentNotificationType type) { std::optional<data_sharing::GroupId> collaboration_group_id = GetCollaborationGroupId(group_id); if (!collaboration_group_id) { @@ -632,7 +628,7 @@ } std::vector<PersistentMessage> MessagingBackendServiceImpl::GetMessages( - std::optional<PersistentNotificationType> type) { + PersistentNotificationType type) { DirtyType dirty_type = GetDirtyTypeFromPersistentNotificationTypeForQuery(type); @@ -937,7 +933,8 @@ if (dirty_type != DirtyType::kNone) { PersistentMessage persistent_message = - CreatePersistentMessage(message, std::nullopt, added_tab, std::nullopt); + CreatePersistentMessage(message, std::nullopt, added_tab, + PersistentNotificationType::UNDEFINED); NotifyDisplayPersistentMessagesForTypes( persistent_message, {PersistentNotificationType::CHIP, @@ -978,7 +975,8 @@ // Hide any existing persistent dot or chip messages already showing. PersistentMessage persistent_message = - CreatePersistentMessage(message, std::nullopt, removed_tab, std::nullopt); + CreatePersistentMessage(message, std::nullopt, removed_tab, + PersistentNotificationType::UNDEFINED); NotifyHidePersistentMessagesForTypes(persistent_message, {PersistentNotificationType::CHIP, @@ -1048,7 +1046,8 @@ } PersistentMessage persistent_message = - CreatePersistentMessage(message, std::nullopt, updated_tab, std::nullopt); + CreatePersistentMessage(message, std::nullopt, updated_tab, + PersistentNotificationType::UNDEFINED); if (dirty_type == DirtyType::kNone) { NotifyHidePersistentMessagesForTypes( @@ -1291,7 +1290,7 @@ void MessagingBackendServiceImpl::ClearPersistentMessage( const base::Uuid& message_id, - std::optional<PersistentNotificationType> type) { + PersistentNotificationType type) { store_->ClearDirtyMessage( message_id, GetDirtyTypeFromPersistentNotificationTypeForQuery(type)); } @@ -1590,7 +1589,7 @@ MessagingBackendServiceImpl::ConvertMessagesToPersistentMessages( const std::vector<collaboration_pb::Message>& messages, DirtyType lookup_dirty_type, - const std::optional<PersistentNotificationType>& type) { + PersistentNotificationType type) { std::vector<PersistentMessage> result; for (const auto& message : messages) { // Each DB message might result in multiple individual PersistentMessages. @@ -1608,7 +1607,7 @@ MessagingBackendServiceImpl::ConvertMessageToPersistentMessages( const collaboration_pb::Message& message, DirtyType lookup_dirty_type, - const std::optional<PersistentNotificationType>& type, + PersistentNotificationType type, bool allow_dirty_tab_group_message) { std::vector<PersistentMessage> persistent_messages; std::optional<tab_groups::SavedTabGroup> tab_group = @@ -1638,11 +1637,12 @@ bool has_dirty_dot = message.dirty() & static_cast<int>(DirtyType::kDot); bool looking_for_dirty_dot = lookup_dirty_type == DirtyType::kAll || lookup_dirty_type == DirtyType::kDot; - bool add_dirty_tab_messages = - !type || *type == PersistentNotificationType::DIRTY_TAB; + bool add_dirty_tab_messages = type == PersistentNotificationType::UNDEFINED || + type == PersistentNotificationType::DIRTY_TAB; bool add_dirty_tab_group_messages = allow_dirty_tab_group_message && - (!type || *type == PersistentNotificationType::DIRTY_TAB_GROUP); + (type == PersistentNotificationType::UNDEFINED || + type == PersistentNotificationType::DIRTY_TAB_GROUP); bool has_dirty_tab_messages_in_group = !store_ ->GetDirtyMessagesForGroup( @@ -1680,15 +1680,13 @@ const collaboration_pb::Message& message, const std::optional<tab_groups::SavedTabGroup>& tab_group, const std::optional<tab_groups::SavedTabGroupTab>& tab, - const std::optional<PersistentNotificationType>& type) { + PersistentNotificationType type) { PersistentMessage persistent_message; persistent_message.collaboration_event = ToCollaborationEvent(message.event_type()); persistent_message.attribution = CreateMessageAttributionForTabUpdates(message, tab_group, tab); - if (type) { - persistent_message.type = *type; - } + persistent_message.type = type; return persistent_message; }
diff --git a/components/collaboration/internal/messaging/messaging_backend_service_impl.h b/components/collaboration/internal/messaging/messaging_backend_service_impl.h index ec8c63f..70c870a 100644 --- a/components/collaboration/internal/messaging/messaging_backend_service_impl.h +++ b/components/collaboration/internal/messaging/messaging_backend_service_impl.h
@@ -64,19 +64,18 @@ bool IsInitialized() override; std::vector<PersistentMessage> GetMessagesForTab( tab_groups::EitherTabID tab_id, - std::optional<PersistentNotificationType> type) override; + PersistentNotificationType type) override; std::vector<PersistentMessage> GetMessagesForGroup( tab_groups::EitherGroupID group_id, - std::optional<PersistentNotificationType> type) override; + PersistentNotificationType type) override; std::vector<PersistentMessage> GetMessages( - std::optional<PersistentNotificationType> type) override; + PersistentNotificationType type) override; std::vector<ActivityLogItem> GetActivityLog( const ActivityLogQueryParams& params) override; void ClearDirtyTabMessagesForGroup( const data_sharing::GroupId& collaboration_group_id) override; - void ClearPersistentMessage( - const base::Uuid& message_id, - std::optional<PersistentNotificationType> type) override; + void ClearPersistentMessage(const base::Uuid& message_id, + PersistentNotificationType type) override; void RemoveMessages(const std::vector<base::Uuid>& message_ids) override; void AddActivityLogForTesting( data_sharing::GroupId collaboration_id, @@ -179,14 +178,14 @@ std::vector<PersistentMessage> ConvertMessagesToPersistentMessages( const std::vector<collaboration_pb::Message>& messages, DirtyType lookup_dirty_type, - const std::optional<PersistentNotificationType>& type); + PersistentNotificationType type); // Convert a single stored Message to PersistentMessages. Each stored message // may result in multiple PersistentMessages, e.g. both CHIP and DIRTY_TAB. std::vector<PersistentMessage> ConvertMessageToPersistentMessages( const collaboration_pb::Message& message, DirtyType lookup_dirty_type, - const std::optional<PersistentNotificationType>& type, + PersistentNotificationType type, bool allow_dirty_tab_group_message); // Creates a PersistentMessage based on the provided information. @@ -194,7 +193,7 @@ const collaboration_pb::Message& message, const std::optional<tab_groups::SavedTabGroup>& tab_group, const std::optional<tab_groups::SavedTabGroupTab>& tab, - const std::optional<PersistentNotificationType>& type); + PersistentNotificationType type); InstantMessage CreateInstantMessage( const collaboration_pb::Message& message,
diff --git a/components/collaboration/internal/messaging/messaging_backend_service_impl_unittest.cc b/components/collaboration/internal/messaging/messaging_backend_service_impl_unittest.cc index a76ff16..e214f91 100644 --- a/components/collaboration/internal/messaging/messaging_backend_service_impl_unittest.cc +++ b/components/collaboration/internal/messaging/messaging_backend_service_impl_unittest.cc
@@ -1594,7 +1594,8 @@ TEST_F(MessagingBackendServiceImplTest, TestGetMessagesNoMessages) { CreateAndInitializeService(); - std::vector<PersistentMessage> messages = service_->GetMessages(std::nullopt); + std::vector<PersistentMessage> messages = + service_->GetMessages(PersistentNotificationType::UNDEFINED); EXPECT_EQ(0u, messages.size()); } @@ -1605,7 +1606,8 @@ data_sharing::GroupId("my group id"); base::Time now = base::Time::Now(); - std::vector<PersistentMessage> messages = service_->GetMessages(std::nullopt); + std::vector<PersistentMessage> messages = + service_->GetMessages(PersistentNotificationType::UNDEFINED); EXPECT_EQ(0u, messages.size()); collaboration_pb::Message message = CreateStoredMessage( @@ -1614,7 +1616,7 @@ AddMessage(message); // Our service will need to also query for dirty dot messages for a group. - messages = service_->GetMessages(std::nullopt); + messages = service_->GetMessages(PersistentNotificationType::UNDEFINED); // Should become two PersistentMessages for the tab, and one for the tab // group. ASSERT_EQ(3u, messages.size()); @@ -1633,7 +1635,8 @@ data_sharing::GroupId("my group id"); base::Time now = base::Time::Now(); - std::vector<PersistentMessage> messages = service_->GetMessages(std::nullopt); + std::vector<PersistentMessage> messages = + service_->GetMessages(PersistentNotificationType::UNDEFINED); EXPECT_EQ(0u, messages.size()); collaboration_pb::Message message1 = CreateStoredMessage( @@ -1645,7 +1648,7 @@ AddMessage(message1); AddMessage(message2); - messages = service_->GetMessages(std::nullopt); + messages = service_->GetMessages(PersistentNotificationType::UNDEFINED); // Should become two PersistentMessages for each tab, and one for the tab // group. ASSERT_EQ(5u, messages.size()); @@ -1695,7 +1698,8 @@ base::Time now = base::Time::Now(); // Start with no messages in the DB. - std::vector<PersistentMessage> messages = service_->GetMessages(std::nullopt); + std::vector<PersistentMessage> messages = + service_->GetMessages(PersistentNotificationType::UNDEFINED); EXPECT_EQ(0u, messages.size()); // Add a tab message to the DB. @@ -1720,7 +1724,8 @@ // messages for the tab (chip and dirty dot), and one for the tab group (dirty // dot). messages = service_->GetMessagesForGroup( - tab_groups::EitherGroupID(tab_group.saved_guid()), std::nullopt); + tab_groups::EitherGroupID(tab_group.saved_guid()), + PersistentNotificationType::UNDEFINED); ASSERT_EQ(3u, messages.size()); EXPECT_EQ(CollaborationEvent::TAB_ADDED, messages.at(0).collaboration_event); EXPECT_EQ(PersistentNotificationType::CHIP, messages.at(0).type); @@ -1783,7 +1788,8 @@ base::Time now = base::Time::Now(); // Start with no messages in the DB. - std::vector<PersistentMessage> messages = service_->GetMessages(std::nullopt); + std::vector<PersistentMessage> messages = + service_->GetMessages(PersistentNotificationType::UNDEFINED); EXPECT_EQ(0u, messages.size()); // Add a tab message to the DB. @@ -1813,7 +1819,8 @@ // messages for the tab (chip and dirty dot), and one for the tab group (dirty // dot). messages = service_->GetMessagesForGroup( - tab_groups::EitherGroupID(tab_group.saved_guid()), std::nullopt); + tab_groups::EitherGroupID(tab_group.saved_guid()), + PersistentNotificationType::UNDEFINED); ASSERT_EQ(3u, messages.size()); EXPECT_EQ(CollaborationEvent::TAB_ADDED, messages.at(0).collaboration_event); EXPECT_EQ(PersistentNotificationType::CHIP, messages.at(0).type); @@ -1909,7 +1916,8 @@ AddMessage(message); EXPECT_TRUE(HasDirtyMessages()); - service_->ClearPersistentMessage(uuid1, std::nullopt); + service_->ClearPersistentMessage(uuid1, + PersistentNotificationType::UNDEFINED); EXPECT_FALSE(HasDirtyMessages()); } @@ -1961,7 +1969,8 @@ data_sharing::GroupId("my group id"); base::Time now = base::Time::Now(); - std::vector<PersistentMessage> messages = service_->GetMessages(std::nullopt); + std::vector<PersistentMessage> messages = + service_->GetMessages(PersistentNotificationType::UNDEFINED); EXPECT_EQ(0u, messages.size()); // The query should come for the given tab's tab group. @@ -1983,7 +1992,7 @@ AddMessage(message); messages = service_->GetMessagesForTab(tab_groups::EitherTabID(tab1_sync_id), - std::nullopt); + PersistentNotificationType::UNDEFINED); // Should become two PersistentMessages for the tab, but nothing from the // group. ASSERT_EQ(2u, messages.size());
diff --git a/components/collaboration/public/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendService.java b/components/collaboration/public/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendService.java index 02ffadf..63818b0 100644 --- a/components/collaboration/public/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendService.java +++ b/components/collaboration/public/android/java/src/org/chromium/components/collaboration/messaging/MessagingBackendService.java
@@ -10,7 +10,6 @@ import org.chromium.components.tab_group_sync.EitherId.EitherTabId; import java.util.List; -import java.util.Optional; import java.util.Set; /** @@ -86,11 +85,10 @@ * PersistentMessageObserver#onMessagingBackendServiceInitialized}. * * @param tabId The ID of the tab to scope messages to. - * @param type The type of message to query to. Pass Optional.empty() to return all message - * types. + * @param type The type of message to query to. Pass UNDEFINED to return all message types. */ List<PersistentMessage> getMessagesForTab( - EitherTabId tabId, Optional</* @PersistentNotificationType */ Integer> type); + EitherTabId tabId, @PersistentNotificationType int type); /** * Queries for all {@link PersistentMessage}s associated with a group ID. Will return an empty @@ -101,10 +99,10 @@ * PersistentMessageObserver#onMessagingBackendServiceInitialized}. * * @param groupId The ID of the group to scope messages to. - * @param type The message type to query for. Pass Optional.empty() to return all message types. + * @param type The message type to query for. Pass UNDEFINED to return all message types. */ List<PersistentMessage> getMessagesForGroup( - EitherGroupId groupId, Optional</* @PersistentNotificationType */ Integer> type); + EitherGroupId groupId, @PersistentNotificationType int type); /** * Queries for all {@link PersistentMessage}s. @@ -113,9 +111,9 @@ * #isInitialized()} to check initialization state, or listen for broadcasts of {@link * PersistentMessageObserver#onMessagingBackendServiceInitialized}. * - * @param type The message type to query for. Pass Optional.empty() to return all message types. + * @param type The message type to query for. Pass UNDEFINED to return all message types. */ - List<PersistentMessage> getMessages(Optional</* @PersistentNotificationType */ Integer> type); + List<PersistentMessage> getMessages(@PersistentNotificationType int type); /** * Queries for all {@link ActivityLogItem}s. @@ -139,8 +137,7 @@ * for the message. * * @param messageId The ID of the messasge. - * @param type The message type to clear. Pass Optional.empty() to clear out all message types. + * @param type The message type to clear. Pass UNDEFINED to clear all message types. */ - void clearPersistentMessage( - String messageId, Optional</* @PersistentNotificationType */ Integer> type); + void clearPersistentMessage(String messageId, @PersistentNotificationType int type); }
diff --git a/components/collaboration/public/android/java/src/org/chromium/components/collaboration/messaging/TabGroupMessageMetadata.java b/components/collaboration/public/android/java/src/org/chromium/components/collaboration/messaging/TabGroupMessageMetadata.java index 5b82143..8691c431 100644 --- a/components/collaboration/public/android/java/src/org/chromium/components/collaboration/messaging/TabGroupMessageMetadata.java +++ b/components/collaboration/public/android/java/src/org/chromium/components/collaboration/messaging/TabGroupMessageMetadata.java
@@ -8,13 +8,10 @@ import org.chromium.build.annotations.Nullable; import org.chromium.components.tab_group_sync.LocalTabGroupId; -import java.util.Optional; - /** * Metadata about a tab within {@link MessageAttribution}. This is a shim layer for the native * representation of the object. See //components/collaboration/public/messaging/message.h for * specific details. - * TODO: Add a proper constructor to avoid @SuppressWarnings("NullAway.Init") */ @NullMarked public class TabGroupMessageMetadata { @@ -24,6 +21,5 @@ // Use {@link #hasColor()} to inspect if this field has a value. // The Integer should be assumed to be of type {@link TabGroupColorId}. - @SuppressWarnings("NullAway.Init") // This is set to a non-null value immediately after init - public Optional<Integer> lastKnownColor; + public @Nullable Integer lastKnownColor; }
diff --git a/components/collaboration/public/messaging/empty_messaging_backend_service.cc b/components/collaboration/public/messaging/empty_messaging_backend_service.cc index 96b7f8f7..1aecb11 100644 --- a/components/collaboration/public/messaging/empty_messaging_backend_service.cc +++ b/components/collaboration/public/messaging/empty_messaging_backend_service.cc
@@ -4,7 +4,6 @@ #include "components/collaboration/public/messaging/empty_messaging_backend_service.h" -#include <optional> #include <vector> #include "components/collaboration/public/messaging/message.h" @@ -31,19 +30,19 @@ std::vector<PersistentMessage> EmptyMessagingBackendService::GetMessagesForTab( tab_groups::EitherTabID tab_id, - std::optional<PersistentNotificationType> type) { + PersistentNotificationType type) { return std::vector<PersistentMessage>(); } std::vector<PersistentMessage> EmptyMessagingBackendService::GetMessagesForGroup( tab_groups::EitherGroupID group_id, - std::optional<PersistentNotificationType> type) { + PersistentNotificationType type) { return std::vector<PersistentMessage>(); } std::vector<PersistentMessage> EmptyMessagingBackendService::GetMessages( - std::optional<PersistentNotificationType> type) { + PersistentNotificationType type) { return std::vector<PersistentMessage>(); } @@ -57,7 +56,7 @@ void EmptyMessagingBackendService::ClearPersistentMessage( const base::Uuid& message_id, - std::optional<PersistentNotificationType> type) {} + PersistentNotificationType type) {} void EmptyMessagingBackendService::RemoveMessages( const std::vector<base::Uuid>& message_ids) {}
diff --git a/components/collaboration/public/messaging/empty_messaging_backend_service.h b/components/collaboration/public/messaging/empty_messaging_backend_service.h index 9dbdce9..f8ad0c1 100644 --- a/components/collaboration/public/messaging/empty_messaging_backend_service.h +++ b/components/collaboration/public/messaging/empty_messaging_backend_service.h
@@ -28,19 +28,18 @@ bool IsInitialized() override; std::vector<PersistentMessage> GetMessagesForTab( tab_groups::EitherTabID tab_id, - std::optional<PersistentNotificationType> type) override; + PersistentNotificationType type) override; std::vector<PersistentMessage> GetMessagesForGroup( tab_groups::EitherGroupID group_id, - std::optional<PersistentNotificationType> type) override; + PersistentNotificationType type) override; std::vector<PersistentMessage> GetMessages( - std::optional<PersistentNotificationType> type) override; + PersistentNotificationType type) override; std::vector<ActivityLogItem> GetActivityLog( const ActivityLogQueryParams& params) override; void ClearDirtyTabMessagesForGroup( const data_sharing::GroupId& collaboration_group_id) override; - void ClearPersistentMessage( - const base::Uuid& message_id, - std::optional<PersistentNotificationType> type) override; + void ClearPersistentMessage(const base::Uuid& message_id, + PersistentNotificationType type) override; void RemoveMessages(const std::vector<base::Uuid>& message_ids) override; void AddActivityLogForTesting( data_sharing::GroupId collaboration_id,
diff --git a/components/collaboration/public/messaging/messaging_backend_service.h b/components/collaboration/public/messaging/messaging_backend_service.h index 02040aaa..95e03e1 100644 --- a/components/collaboration/public/messaging/messaging_backend_service.h +++ b/components/collaboration/public/messaging/messaging_backend_service.h
@@ -105,12 +105,12 @@ // of PersistentMessageObserver::OnMessagingBackendServiceInitialized(). virtual std::vector<PersistentMessage> GetMessagesForTab( tab_groups::EitherTabID tab_id, - std::optional<PersistentNotificationType> type) = 0; + PersistentNotificationType type) = 0; virtual std::vector<PersistentMessage> GetMessagesForGroup( tab_groups::EitherGroupID group_id, - std::optional<PersistentNotificationType> type) = 0; + PersistentNotificationType type) = 0; virtual std::vector<PersistentMessage> GetMessages( - std::optional<PersistentNotificationType> type) = 0; + PersistentNotificationType type) = 0; // Central method to query the list of rows to be shown in the activity log // UI. Will return an empty list if the service has not been initialized. @@ -124,11 +124,11 @@ const data_sharing::GroupId& collaboration_group_id) = 0; // Invoked to clear a given persistent message. This will clear the specified - // dirty bit on the message entry of the database. If std::nullopt is passed, - // all dirty bits of that message will be cleared. - virtual void ClearPersistentMessage( - const base::Uuid& message_id, - std::optional<PersistentNotificationType> type) = 0; + // dirty bit on the message entry of the database. If + // PersistentNotificationType::UNDEFINED is passed, all dirty bits of that + // message will be cleared. + virtual void ClearPersistentMessage(const base::Uuid& message_id, + PersistentNotificationType type) = 0; // Deprecated. Do not use. Use ClearPersistentMessage instead. // Invoked to remove a list of given messages from the backend storage.
diff --git a/components/collaboration/test_support/mock_messaging_backend_service.h b/components/collaboration/test_support/mock_messaging_backend_service.h index b5800be..ecd3a267 100644 --- a/components/collaboration/test_support/mock_messaging_backend_service.h +++ b/components/collaboration/test_support/mock_messaging_backend_service.h
@@ -25,15 +25,13 @@ MOCK_METHOD(bool, IsInitialized, ()); MOCK_METHOD(std::vector<PersistentMessage>, GetMessagesForTab, - (tab_groups::EitherTabID, - std::optional<PersistentNotificationType>)); + (tab_groups::EitherTabID, PersistentNotificationType)); MOCK_METHOD(std::vector<PersistentMessage>, GetMessagesForGroup, - (tab_groups::EitherGroupID, - std::optional<PersistentNotificationType>)); + (tab_groups::EitherGroupID, PersistentNotificationType)); MOCK_METHOD(std::vector<PersistentMessage>, GetMessages, - (std::optional<PersistentNotificationType>)); + (PersistentNotificationType)); MOCK_METHOD(std::vector<ActivityLogItem>, GetActivityLog, (const ActivityLogQueryParams&)); @@ -42,7 +40,7 @@ (const data_sharing::GroupId&)); MOCK_METHOD(void, ClearPersistentMessage, - (const base::Uuid&, std::optional<PersistentNotificationType>)); + (const base::Uuid&, PersistentNotificationType)); MOCK_METHOD(void, RemoveMessages, (const std::vector<base::Uuid>&)); MOCK_METHOD(void, AddActivityLogForTesting,
diff --git a/components/infobars/android/confirm_infobar.cc b/components/infobars/android/confirm_infobar.cc index ee05139..9233e457 100644 --- a/components/infobars/android/confirm_infobar.cc +++ b/components/infobars/android/confirm_infobar.cc
@@ -12,6 +12,7 @@ #include "ui/base/models/image_model.h" #include "ui/gfx/android/java_bitmap.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/image/image_skia.h" // Must come after all headers that specialize FromJniType() / ToJniType(). #include "components/infobars/android/jni_headers/ConfirmInfoBar_jni.h"
diff --git a/components/infobars/core/confirm_infobar_delegate.h b/components/infobars/core/confirm_infobar_delegate.h index 236288a..a3aea2de 100644 --- a/components/infobars/core/confirm_infobar_delegate.h +++ b/components/infobars/core/confirm_infobar_delegate.h
@@ -11,7 +11,6 @@ #include "build/build_config.h" #include "components/infobars/core/infobar_delegate.h" #include "components/infobars/core/infobar_manager.h" -#include "ui/gfx/image/image_skia.h" #include "ui/gfx/text_constants.h" namespace infobars {
diff --git a/components/omnibox/browser/location_bar_model_impl_unittest.cc b/components/omnibox/browser/location_bar_model_impl_unittest.cc index d64a6f9..50776eb 100644 --- a/components/omnibox/browser/location_bar_model_impl_unittest.cc +++ b/components/omnibox/browser/location_bar_model_impl_unittest.cc
@@ -20,6 +20,7 @@ #include "ui/base/ui_base_features.h" #include "ui/gfx/color_palette.h" #include "ui/gfx/favicon_size.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/paint_vector_icon.h" #include "url/gurl.h" #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc index 3ad139c..a906f0a1 100644 --- a/components/password_manager/core/browser/password_form_manager.cc +++ b/components/password_manager/core/browser/password_form_manager.cc
@@ -722,7 +722,6 @@ void PasswordFormManager::SetGenerationElement( FieldRendererId generation_element) { - generation_element_ = generation_element; if (votes_uploader_.has_value()) { votes_uploader_->set_generation_element(generation_element); } @@ -769,23 +768,11 @@ modified_field->set_value(field_value); mutable_observed_form()->set_fields(std::move(fields)); - if (!HasGeneratedPassword()) { - return; + if (HasGeneratedPassword()) { + // Update the presaved password form in the case the username has changed. + PresaveGeneratedPasswordInternal( + *observed_form(), password_save_manager_->GetGeneratedPassword()); } - - SCOPED_CRASH_KEY_NUMBER("Bug40072712", "pmf_genElemId", - generation_element_.value()); - - // Update the presaved password form. Even if generated password was not - // modified, the user might have modified the username. - std::u16string generated_password = - password_save_manager_->GetGeneratedPassword(); - CHECK(!generated_password.empty()); - if (generation_element_ == field_id) { - generated_password = field_value; - CHECK(!generated_password.empty()); - } - PresaveGeneratedPasswordInternal(*observed_form(), generated_password); } void PasswordFormManager::SetDriver(
diff --git a/components/password_manager/core/browser/password_form_manager.h b/components/password_manager/core/browser/password_form_manager.h index 8b435d0..28a9c229 100644 --- a/components/password_manager/core/browser/password_form_manager.h +++ b/components/password_manager/core/browser/password_form_manager.h
@@ -518,9 +518,6 @@ // In that case we should schedule a Save() call, when FormFecher is ready. bool should_schedule_save_for_later_ = false; - // A password field that is used for generation. - autofill::FieldRendererId generation_element_; - // For generating timing metrics on retrieving server-side predictions. std::unique_ptr<base::ElapsedTimer> server_side_predictions_timer_;
diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc index 1d7fcace..be5cbf0c 100644 --- a/components/password_manager/core/browser/password_form_manager_unittest.cc +++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -2993,8 +2993,7 @@ // Use |generated_password| different from value in field to test that the // generated password is saved. const std::u16string generated_password = u"gen_pw"; - FieldRendererId generation_element = password_field.renderer_id(); - form_manager_->SetGenerationElement(generation_element); + form_manager_->SetGenerationElement(password_field.renderer_id()); PasswordForm saved_form; EXPECT_CALL(form_saver, Save(_, IsEmpty(), std::u16string())) @@ -3004,14 +3003,15 @@ Mock::VerifyAndClearExpectations(&form_saver); - const std::u16string changed_password = generated_password + u"1"; + const std::u16string changed_username = generated_password + u"1"; EXPECT_CALL(form_saver, UpdateReplace(_, _, std::u16string(), _)) .WillOnce(SaveArg<0>(&saved_form)); form_manager_->UpdateStateOnUserInput(form_to_presave.renderer_id(), - generation_element, changed_password); - EXPECT_EQ(username_field.value(), saved_form.username_value); - EXPECT_EQ(changed_password, saved_form.password_value); + username_field.renderer_id(), + changed_username); + EXPECT_EQ(changed_username, saved_form.username_value); + EXPECT_EQ(generated_password, saved_form.password_value); } TEST_P(PasswordFormManagerTest, iOSUpdateStateWithoutPresaving) {
diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc index 9480753..f3bb2e4 100644 --- a/components/password_manager/core/browser/password_manager_unittest.cc +++ b/components/password_manager/core/browser/password_manager_unittest.cc
@@ -1060,19 +1060,6 @@ const scoped_refptr<autofill::FieldDataManager> field_data_manager = base::MakeRefCounted<autofill::FieldDataManager>(); - // Test when the user is changing the generated password, presaved credential - // is updated. - generated_password += u"1"; - manager()->UpdateStateOnUserInput(&driver_, *field_data_manager, - form_data.renderer_id(), generation_element, - generated_password); - task_environment_.RunUntilIdle(); - EXPECT_THAT(store_->stored_passwords(), - ElementsAre(Pair( - GetSignonRealm(form_data.url()), - ElementsAre(FormUsernamePasswordAre( - form_data.fields()[0].value(), generated_password))))); - // Test when the user is changing the username, presaved credential is // updated. username += u"1";
diff --git a/components/password_manager/ios/shared_password_controller.mm b/components/password_manager/ios/shared_password_controller.mm index b7a00cf..1d694015 100644 --- a/components/password_manager/ios/shared_password_controller.mm +++ b/components/password_manager/ios/shared_password_controller.mm
@@ -1111,12 +1111,13 @@ generationData->confirmation_password_renderer_id; __weak SharedPasswordController* weakSelf = self; + base::WeakPtr<web::WebFrame> weakFrame = frame->AsWeakPtr(); auto generatedPasswordInjected = ^(BOOL success) { if (success) { [weakSelf onFilledPasswordForm:formIdentifier withGeneratedPassword:generatedPassword passwordUniqueId:newPasswordUniqueId - inFrame:frame]; + inFrame:weakFrame]; } if (completionHandler) { completionHandler(); @@ -1134,7 +1135,7 @@ - (void)onFilledPasswordForm:(FormRendererId)formIdentifier withGeneratedPassword:(NSString*)generatedPassword passwordUniqueId:(FieldRendererId)newPasswordUniqueId - inFrame:(web::WebFrame*)frame { + inFrame:(base::WeakPtr<web::WebFrame>)weakFrame { __weak SharedPasswordController* weakSelf = self; auto passwordPresaved = ^(BOOL found, const autofill::FormData& form) { // If the form isn't found, it disappeared between the call to @@ -1143,17 +1144,40 @@ if (!found) return; - [weakSelf presaveGeneratedPassword:generatedPassword - formData:form - inFrame:frame]; + [weakSelf didExtractGeneratedPasswordForm:form + withGeneratedPassword:generatedPassword + newPasswordID:newPasswordUniqueId + inFrame:weakFrame]; }; + if (!weakFrame) { + return; + } + [self.formHelper extractPasswordFormData:formIdentifier - inFrame:frame + inFrame:weakFrame.get() completionHandler:passwordPresaved]; +} +- (void)didExtractGeneratedPasswordForm:(const autofill::FormData&)form + withGeneratedPassword:(NSString*)password + newPasswordID:(FieldRendererId)newPasswordID + inFrame: + (base::WeakPtr<web::WebFrame>)weakFrame { + web::WebFrame* frame = weakFrame.get(); + if (!frame) { + return; + } + FieldGlobalId newPasswordGlobalId = {GetLocalFrameToken(frame), + newPasswordID}; + if (!form.FindFieldByGlobalId(newPasswordGlobalId)) { + // The form that was filled with the generated password should contain the + // new password field that was intended to fill. Otherwise, we are in an + // undesired state hence abort presaving the generated password. + return; + } + [self presaveGeneratedPassword:password formData:form inFrame:frame]; self.isPasswordGenerated = YES; - self.passwordGeneratedIdentifier = {GetLocalFrameToken(frame), - newPasswordUniqueId}; + self.passwordGeneratedIdentifier = {GetLocalFrameToken(frame), newPasswordID}; } - (void)presaveGeneratedPassword:(NSString*)generatedPassword
diff --git a/components/password_manager/ios/shared_password_controller_unittest.mm b/components/password_manager/ios/shared_password_controller_unittest.mm index f6d68e1..732de66 100644 --- a/components/password_manager/ios/shared_password_controller_unittest.mm +++ b/components/password_manager/ios/shared_password_controller_unittest.mm
@@ -118,12 +118,26 @@ return form; } +// Returns a LocalFrameToken that uniquely identifies the `frame`. Returns an +// empty token if it can't be constructed (e.g. because the frame id isn't of +// the right length). +autofill::LocalFrameToken GetLocalFrameToken(web::WebFrame* frame) { + return std::optional<autofill::LocalFrameToken>( + autofill::DeserializeJavaScriptFrameId(frame->GetFrameId())) + .value_or(autofill::LocalFrameToken()); +} + // Creates a basic signup form with one username field and one password field. -FormData CreateSignupForm() { +// Set the optional `host_frame` in the form and fields. Uses the default empty +// frame token if not provided. +FormData CreateSignupForm( + autofill::LocalFrameToken host_frame = autofill::LocalFrameToken()) { FormData form_data = test_helpers::MakeSimpleFormData(); form_data.set_renderer_id(autofill::test::MakeFormRendererId()); + form_data.set_host_frame(host_frame); for (auto& field_data : test_api(form_data).fields()) { field_data.set_renderer_id(autofill::test::MakeFieldRendererId()); + field_data.set_host_frame(host_frame); } test_api(form_data).fields().back().set_max_length(kMaxPasswordLength); return form_data; @@ -793,7 +807,17 @@ TEST_F(SharedPasswordControllerTest, PresavesGeneratedPassword) { base::HistogramTester histogram_tester; - FormData form_data = CreateSignupForm(); + web_state_.SetCurrentURL(GURL(kTestURL)); + web_state_.SetContentIsHTML(true); + + // Set up the frame that hosts the new password form. + auto web_frame = + web::FakeWebFrame::Create(SysNSStringToUTF8(kTestFrameID), + /*is_main_frame=*/true, GURL(kTestURL)); + web::FakeWebFrame* frame = web_frame.get(); + AddWebFrame(std::move(web_frame)); + + FormData form_data = CreateSignupForm(GetLocalFrameToken(frame)); autofill::FormRendererId form_id = form_data.renderer_id(); autofill::FieldRendererId password_field_id = form_data.fields()[1].renderer_id(); @@ -805,16 +829,6 @@ form_id, password_field_id, password_field_id}; [controller_ formEligibleForGenerationFound:form_generation_data]; - web_state_.SetCurrentURL(GURL(kTestURL)); - web_state_.SetContentIsHTML(true); - - // Set up the frame that hosts the new password form. - auto web_frame = - web::FakeWebFrame::Create(SysNSStringToUTF8(kTestFrameID), - /*is_main_frame=*/true, GURL(kTestURL)); - web::FakeWebFrame* frame = web_frame.get(); - AddWebFrame(std::move(web_frame)); - // Show and accept password in the same loop. id decision_handler_arg = [OCMArg checkWithBlock:^(void (^decision_handler)(BOOL)) {
diff --git a/components/sync/test/fake_data_type_sync_bridge.cc b/components/sync/test/fake_data_type_sync_bridge.cc index 92c6d80..029ba0b 100644 --- a/components/sync/test/fake_data_type_sync_bridge.cc +++ b/components/sync/test/fake_data_type_sync_bridge.cc
@@ -4,7 +4,6 @@ #include "components/sync/test/fake_data_type_sync_bridge.h" -#include <set> #include <utility> #include "base/functional/bind.h" @@ -25,6 +24,7 @@ #include "components/sync/protocol/entity_specifics.pb.h" #include "components/sync/protocol/unique_position.pb.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/abseil-cpp/absl/container/flat_hash_set.h" using sync_pb::DataTypeState; using sync_pb::EntityMetadata; @@ -196,7 +196,7 @@ return ModelError(FROM_HERE, syncer::ModelError::Type::kGenericTestError); } - std::set<std::string> remote_storage_keys; + absl::flat_hash_set<std::string> remote_storage_keys; // Store any new remote entities. for (const std::unique_ptr<EntityChange>& change : entity_data) { EXPECT_FALSE(change->data().is_deleted());
diff --git a/components/sync/test/fake_data_type_sync_bridge.h b/components/sync/test/fake_data_type_sync_bridge.h index 5b34c4d..d3fd1c7 100644 --- a/components/sync/test/fake_data_type_sync_bridge.h +++ b/components/sync/test/fake_data_type_sync_bridge.h
@@ -5,12 +5,9 @@ #ifndef COMPONENTS_SYNC_TEST_FAKE_DATA_TYPE_SYNC_BRIDGE_H_ #define COMPONENTS_SYNC_TEST_FAKE_DATA_TYPE_SYNC_BRIDGE_H_ -#include <map> #include <memory> #include <optional> -#include <set> #include <string> -#include <unordered_set> #include "base/functional/callback_forward.h" #include "components/sync/model/data_type_local_change_processor.h" @@ -18,6 +15,8 @@ #include "components/sync/model/model_error.h" #include "components/sync/protocol/data_type_state.pb.h" #include "components/sync/protocol/unique_position.pb.h" +#include "third_party/abseil-cpp/absl/container/flat_hash_map.h" +#include "third_party/abseil-cpp/absl/container/flat_hash_set.h" namespace sync_pb { class EntityMetadata; @@ -59,7 +58,8 @@ const EntityData& GetData(const std::string& key) const; const sync_pb::EntityMetadata& GetMetadata(const std::string& key) const; - const std::map<std::string, std::unique_ptr<EntityData>>& all_data() const { + const absl::flat_hash_map<std::string, std::unique_ptr<EntityData>>& + all_data() const { return data_store_; } @@ -82,8 +82,8 @@ private: size_t data_change_count_ = 0; size_t metadata_change_count_ = 0; - std::map<std::string, std::unique_ptr<EntityData>> data_store_; - std::map<std::string, sync_pb::EntityMetadata> metadata_store_; + absl::flat_hash_map<std::string, std::unique_ptr<EntityData>> data_store_; + absl::flat_hash_map<std::string, sync_pb::EntityMetadata> metadata_store_; sync_pb::DataTypeState data_type_state_; }; @@ -177,8 +177,8 @@ void EnableUniquePositionSupport(ExtractUniquePositionCallback callback); // Storage keys for the entities with deleted collaboration membership. - const std::set<std::string>& deleted_collaboration_membership_storage_keys() - const { + const absl::flat_hash_set<std::string>& + deleted_collaboration_membership_storage_keys() const { return deleted_collaboration_membership_storage_keys_; } @@ -210,11 +210,11 @@ ConflictResolution conflict_resolution_; // The preference values that the bridge will ignore. - std::unordered_set<std::string> values_to_ignore_; + absl::flat_hash_set<std::string> values_to_ignore_; // The client tag hashes the bridge will mark as invalid in // calls to IsEntityDataValid(). - std::set<ClientTagHash> invalid_remote_updates_; + absl::flat_hash_set<ClientTagHash> invalid_remote_updates_; // Whether an error should be produced on the next bridge call. bool error_next_ = false; @@ -236,7 +236,8 @@ mutable size_t trimmed_specifics_change_count_ = 0; - std::set<std::string> deleted_collaboration_membership_storage_keys_; + absl::flat_hash_set<std::string> + deleted_collaboration_membership_storage_keys_; ExtractUniquePositionCallback extract_unique_positions_callback_; };
diff --git a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc index 10e0f42b..8ae56b74 100644 --- a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc +++ b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc
@@ -1553,7 +1553,15 @@ EXPECT_EQ(frame_target_id, *params.FindString("targetId")); } -IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, PageCrashClearsPendingCommands) { +// TODO(crbug.com/440535492): Flaky on Win dbg. Re-enable this test. +#if BUILDFLAG(IS_WIN) && !defined(NDEBUG) +#define MAYBE_PageCrashClearsPendingCommands \ + DISABLED_PageCrashClearsPendingCommands +#else +#define MAYBE_PageCrashClearsPendingCommands PageCrashClearsPendingCommands +#endif +IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, + MAYBE_PageCrashClearsPendingCommands) { ASSERT_TRUE(embedded_test_server()->Start()); GURL test_url = embedded_test_server()->GetURL("/devtools/navigation.html"); NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1); @@ -1688,7 +1696,15 @@ // Should not crash at this point. } -IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, InspectorTargetCrashedNavigate) { +// TODO(crbug.com/440535492): Flaky on Win dbg. Re-enable this test. +#if BUILDFLAG(IS_WIN) && !defined(NDEBUG) +#define MAYBE_InspectorTargetCrashedNavigate \ + DISABLED_InspectorTargetCrashedNavigate +#else +#define MAYBE_InspectorTargetCrashedNavigate InspectorTargetCrashedNavigate +#endif +IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, + MAYBE_InspectorTargetCrashedNavigate) { set_agent_host_can_close(); ASSERT_TRUE(embedded_test_server()->Start()); GURL url_a = embedded_test_server()->GetURL("a.com", "/title1.html"); @@ -1708,7 +1724,13 @@ WaitForNotification("Inspector.targetReloadedAfterCrash", true); } -IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, TargetGetTargetsAfterCrash) { +// TODO(crbug.com/440535492): Flaky on Win dbg. Re-enable this test. +#if BUILDFLAG(IS_WIN) && !defined(NDEBUG) +#define MAYBE_TargetGetTargetsAfterCrash DISABLED_TargetGetTargetsAfterCrash +#else +#define MAYBE_TargetGetTargetsAfterCrash TargetGetTargetsAfterCrash +#endif +IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, MAYBE_TargetGetTargetsAfterCrash) { set_agent_host_can_close(); ASSERT_TRUE(embedded_test_server()->Start()); GURL url_a = embedded_test_server()->GetURL("a.com", "/title1.html");
diff --git a/content/browser/devtools/protocol/storage_handler.cc b/content/browser/devtools/protocol/storage_handler.cc index eab9419e..53e898f 100644 --- a/content/browser/devtools/protocol/storage_handler.cc +++ b/content/browser/devtools/protocol/storage_handler.cc
@@ -69,6 +69,7 @@ #include "content/browser/devtools/service_worker_devtools_agent_host.h" #include "content/browser/devtools/shared_worker_devtools_agent_host.h" #include "content/browser/interest_group/interest_group_manager_impl.h" +#include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/devtools/protocol/storage_handler.h b/content/browser/devtools/protocol/storage_handler.h index 1856806d35..e35404e 100644 --- a/content/browser/devtools/protocol/storage_handler.h +++ b/content/browser/devtools/protocol/storage_handler.h
@@ -19,7 +19,6 @@ #include "content/browser/devtools/protocol/storage.h" #include "content/browser/interest_group/devtools_enums.h" #include "content/browser/interest_group/interest_group_manager_impl.h" -#include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/shared_storage/shared_storage_runtime_manager.h" #include "content/public/browser/global_routing_id.h" #include "storage/browser/quota/quota_manager.h"
diff --git a/content/browser/media/capture/desktop_capturer_android_unittest.cc b/content/browser/media/capture/desktop_capturer_android_unittest.cc index 0b10e5f..eab81e8 100644 --- a/content/browser/media/capture/desktop_capturer_android_unittest.cc +++ b/content/browser/media/capture/desktop_capturer_android_unittest.cc
@@ -414,4 +414,85 @@ EXPECT_FALSE(release_cb.WasRun()); } +TEST_F(DesktopCapturerAndroidTest, RgbaFramePreciseBufferBoundaryWithPadding) { + StartCapturer(/*start_success=*/true); + + constexpr int kBufferWidth = 32; + constexpr gfx::Rect kCropRect(2, 3, 16, 12); + constexpr int kStride = kBufferWidth + 100; + constexpr int kOffset = + kCropRect.y() * kStride + kCropRect.x() * kBytesPerPixel; + + constexpr size_t kBufferSize = + kStride * (kCropRect.bottom() - 1) + kCropRect.right() * kBytesPerPixel; + + std::vector<uint8_t> buffer(kBufferSize, 'A'); + auto buffer_span = base::span(buffer); + for (int y = 0; y < kCropRect.height(); ++y) { + for (int x = 0; x < kCropRect.width(); ++x) { + auto pixel_span = + buffer_span.subspan(base::checked_cast<size_t>(kOffset + y * kStride + + x * kBytesPerPixel), + 2u); + pixel_span[0] = static_cast<uint8_t>(x + kCropRect.x()); + pixel_span[1] = static_cast<uint8_t>(y + kCropRect.y()); + } + } + + auto j_buf = CreateJavaByteBuffer(buffer); + RunnableFlag release_cb; + capturer_->OnRgbaFrameAvailable(env_, release_cb.GetJavaObject(), + kTimestampNs, j_buf, kBytesPerPixel, kStride, + kCropRect.x(), kCropRect.y(), + kCropRect.right(), kCropRect.bottom()); + EXPECT_TRUE(release_cb.WasRun()); + + auto [result, frame] = CaptureFrame(); + EXPECT_EQ(result, webrtc::DesktopCapturer::Result::SUCCESS); + ASSERT_TRUE(frame); + EXPECT_EQ(frame->size().width(), kCropRect.width()); + ASSERT_EQ(frame->size().height(), kCropRect.height()); + ASSERT_EQ(frame->stride(), kCropRect.width() * kBytesPerPixel); + + // SAFETY: No safe interface to DesktopFrame. + auto frame_span = UNSAFE_BUFFERS(base::span( + frame->data(), + base::checked_cast<size_t>(frame->stride() * frame->size().height()))); + for (int y = 0; y < kCropRect.height(); ++y) { + for (int x = 0; x < kCropRect.width(); ++x) { + const auto pixel_span = frame_span.subspan( + base::checked_cast<size_t>(y * frame->stride() + x * kBytesPerPixel), + 2u); + const int src_x = x + kCropRect.x(); + const int src_y = y + kCropRect.y(); + EXPECT_EQ(pixel_span[0], static_cast<uint8_t>(src_x)); + EXPECT_EQ(pixel_span[1], static_cast<uint8_t>(src_y)); + } + } +} + +TEST_F(DesktopCapturerAndroidTest, + RgbaFramePreciseBufferBoundaryTooSmallDeathTest) { + StartCapturer(/*start_success=*/true); + + constexpr int kBufferWidth = 32; + constexpr gfx::Rect kCropRect(2, 3, 16, 12); + constexpr int kStride = kBufferWidth + 100; + + constexpr size_t kBufferSize = + kStride * (kCropRect.bottom() - 1) + kCropRect.right() * kBytesPerPixel; + + std::vector<uint8_t> buffer(kBufferSize - 1, 'A'); + auto j_buf = CreateJavaByteBuffer(buffer); + RunnableFlag release_cb; + + // This should CHECK because the buffer was not large enough. + EXPECT_DEATH(capturer_->OnRgbaFrameAvailable( + env_, release_cb.GetJavaObject(), kTimestampNs, j_buf, + kBytesPerPixel, kStride, kCropRect.x(), kCropRect.y(), + kCropRect.right(), kCropRect.bottom()), + ""); + EXPECT_FALSE(release_cb.WasRun()); +} + } // namespace content
diff --git a/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc b/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc index cd434b4c..32478ce 100644 --- a/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc +++ b/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc
@@ -428,8 +428,9 @@ // MSAN is feasible or not // TODO(crbug.com/328658521): It is also flaky on macOS. // TODO(crbug.com/372481179): Failing on win-asan. -#if defined(MEMORY_SANITIZER) || \ - (BUILDFLAG(IS_WIN) && defined(ADDRESS_SANITIZER)) || BUILDFLAG(IS_MAC) +// TODO(crbug.com/440535492): Flaky on Win dbg. Re-enable this test. +#if defined(MEMORY_SANITIZER) || BUILDFLAG(IS_MAC) || \ + (BUILDFLAG(IS_WIN) && (defined(ADDRESS_SANITIZER) || !defined(NDEBUG))) #define MAYBE_RecoversAfterRendererCrash DISABLED_RecoversAfterRendererCrash #else #define MAYBE_RecoversAfterRendererCrash RecoversAfterRendererCrash
diff --git a/content/browser/renderer_host/media/fake_video_capture_device_launcher.cc b/content/browser/renderer_host/media/fake_video_capture_device_launcher.cc index 31520ee..71693d4 100644 --- a/content/browser/renderer_host/media/fake_video_capture_device_launcher.cc +++ b/content/browser/renderer_host/media/fake_video_capture_device_launcher.cc
@@ -112,7 +112,7 @@ auto device_client = std::make_unique<media::VideoCaptureDeviceClient>( std::make_unique<media::VideoFrameReceiverOnTaskRunner>( receiver, base::SingleThreadTaskRunner::GetCurrentDefault()), - std::move(buffer_pool), std::nullopt); + std::move(buffer_pool)); #endif // BUILDFLAG(IS_CHROMEOS) device->AllocateAndStart(params, std::move(device_client)); auto launched_device =
diff --git a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc index 7381b0a..c07b61c 100644 --- a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc +++ b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
@@ -393,7 +393,7 @@ receiver_on_io_thread))); #else return std::make_unique<media::VideoCaptureDeviceClient>( - std::move(receiver), std::move(buffer_pool), std::nullopt); + std::move(receiver), std::move(buffer_pool)); #endif // BUILDFLAG(IS_CHROMEOS) }
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc index 778da4d..1058c490 100644 --- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -200,7 +200,7 @@ device_client_ = std::make_unique<media::VideoCaptureDeviceClient>( std::make_unique<media::VideoFrameReceiverOnTaskRunner>( controller_->GetWeakPtrForIOThread(), GetIOThreadTaskRunner({})), - buffer_pool_, std::nullopt); + buffer_pool_); #endif // BUILDFLAG(IS_CHROMEOS) }
diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc index ce67236..03fe5211 100644 --- a/content/browser/renderer_host/render_process_host_browsertest.cc +++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -382,7 +382,8 @@ }; // Flaky on Android. http://crbug.com/759514. -#if BUILDFLAG(IS_ANDROID) +// TODO(crbug.com/440535492): Flaky on Win dbg. Re-enable this test. +#if BUILDFLAG(IS_ANDROID) || (BUILDFLAG(IS_WIN) && !defined(NDEBUG)) #define MAYBE_AllProcessExitedCallsBeforeAnyHostDestroyedCalls \ DISABLED_AllProcessExitedCallsBeforeAnyHostDestroyedCalls #else
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java index cb7423b5..ecd670c7 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
@@ -13,6 +13,7 @@ import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -572,6 +573,7 @@ @SmallTest @Feature({"AndroidWebView", "Android-JavaBridge"}) @CommandLineFlags.Add("js-flags=--expose-gc") + @Ignore("https://crbug.com/447424913") public void testReturnedObjectIsGarbageCollected() throws Throwable { Assert.assertEquals("function", executeJavaScriptAndGetStringResult("typeof gc")); class InnerObject {}
diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h index 7d308d54..8643783 100644 --- a/content/public/browser/render_frame_host.h +++ b/content/public/browser/render_frame_host.h
@@ -45,7 +45,6 @@ #include "third_party/perfetto/include/perfetto/tracing/traced_value_forward.h" #include "ui/accessibility/ax_node_id_forward.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/image/image_skia.h" #include "ui/gfx/native_ui_types.h" #if BUILDFLAG(IS_ANDROID) @@ -53,6 +52,7 @@ #endif class GURL; +class SkBitmap; namespace network { class PermissionsPolicy;
diff --git a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt index 72b7e89..8687587 100644 --- a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt +++ b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
@@ -1000,6 +1000,17 @@ crbug.com/332743717 [ android android-pixel-2 ] conformance2/canvas/drawingbuffer-storage-test.html [ Failure ] crbug.com/332743717 [ win intel-0x4680 ] conformance2/query/occlusion-query-scissor.html [ Failure ] +############### +# V8 Failures # +############### +crbug.com/447457276 [ android android-pixel-2 graphite-disabled ] deqp/functional/gles3/shadertexturefunction/texturegradoffset.html [ Failure ] +crbug.com/447457276 [ android android-pixel-2 graphite-disabled ] deqp/functional/gles3/shadertexturefunction/textureprojgradoffset.html [ Failure ] + +crbug.com/447457276 [ win qualcomm-0x41333430 graphite-disabled passthrough ] deqp/functional/gles3/shadertexturefunction/texturegradoffset.html [ Failure ] +crbug.com/447457276 [ win qualcomm-0x41333430 graphite-disabled passthrough ] deqp/functional/gles3/shadertexturefunction/textureprojgradoffset.html [ Failure ] + +crbug.com/447457276 [ mac passthrough ] deqp/functional/gles3/shadertexturefunction/texturegradoffset.html [ Failure ] +crbug.com/447457276 [ mac passthrough ] deqp/functional/gles3/shadertexturefunction/textureprojgradoffset.html [ Failure ] ####################################################################### # Automated Entries After This Point - Do Not Manually Add Below Here #
diff --git a/extensions/OWNERS b/extensions/OWNERS index 5e5bed1..2f3d20f 100644 --- a/extensions/OWNERS +++ b/extensions/OWNERS
@@ -16,6 +16,7 @@ finnur@chromium.org jamescook@chromium.org reillyg@chromium.org +solomonkinard@chromium.org # Translation artifacts: per-file ....xtb=file://tools/translation/TRANSLATION_OWNERS
diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn index df138600a..fb3bd34 100644 --- a/extensions/browser/BUILD.gn +++ b/extensions/browser/BUILD.gn
@@ -91,6 +91,8 @@ visibility = [ "./*" ] sources = [ + "active_install_data.cc", + "active_install_data.h", "activity.cc", "activity.h", "allowlist_state.h", @@ -388,9 +390,13 @@ "image_sanitizer.h", "install_flag.h", "install_gate.h", + "install_observer.cc", + "install_observer.h", "install_prefs_helper.cc", "install_prefs_helper.h", "install_stage.h", + "install_tracker.cc", + "install_tracker.h", "json_file_sanitizer.cc", "json_file_sanitizer.h", "l10n_file_util.cc", @@ -469,6 +475,8 @@ "safe_browsing_delegate.h", "sandboxed_unpacker.cc", "sandboxed_unpacker.h", + "scoped_active_install.cc", + "scoped_active_install.h", "script_executor.cc", "script_executor.h", "script_injection_tracker.cc", @@ -911,6 +919,7 @@ "file_reader_unittest.cc", "image_loader_unittest.cc", "image_sanitizer_unittest.cc", + "install_tracker_unittest.cc", "json_file_sanitizer_unittest.cc", "lazy_background_task_queue_unittest.cc", "management_policy_unittest.cc",
diff --git a/chrome/browser/extensions/active_install_data.cc b/extensions/browser/active_install_data.cc similarity index 87% rename from chrome/browser/extensions/active_install_data.cc rename to extensions/browser/active_install_data.cc index 868fa95..db45276cf 100644 --- a/chrome/browser/extensions/active_install_data.cc +++ b/extensions/browser/active_install_data.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/active_install_data.h" +#include "extensions/browser/active_install_data.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension_id.h"
diff --git a/chrome/browser/extensions/active_install_data.h b/extensions/browser/active_install_data.h similarity index 76% rename from chrome/browser/extensions/active_install_data.h rename to extensions/browser/active_install_data.h index c79ea5e..dd8b61d9 100644 --- a/chrome/browser/extensions/active_install_data.h +++ b/extensions/browser/active_install_data.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_EXTENSIONS_ACTIVE_INSTALL_DATA_H_ -#define CHROME_BROWSER_EXTENSIONS_ACTIVE_INSTALL_DATA_H_ +#ifndef EXTENSIONS_BROWSER_ACTIVE_INSTALL_DATA_H_ +#define EXTENSIONS_BROWSER_ACTIVE_INSTALL_DATA_H_ #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension_id.h" @@ -23,4 +23,4 @@ } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_ACTIVE_INSTALL_DATA_H_ +#endif // EXTENSIONS_BROWSER_ACTIVE_INSTALL_DATA_H_
diff --git a/extensions/browser/extension_icon_manager.cc b/extensions/browser/extension_icon_manager.cc index def329f..62b5d0c 100644 --- a/extensions/browser/extension_icon_manager.cc +++ b/extensions/browser/extension_icon_manager.cc
@@ -22,6 +22,7 @@ #include "ui/gfx/favicon_size.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/extensions/install_observer.cc b/extensions/browser/install_observer.cc similarity index 92% rename from chrome/browser/extensions/install_observer.cc rename to extensions/browser/install_observer.cc index e2cc1a9..42fa23d 100644 --- a/chrome/browser/extensions/install_observer.cc +++ b/extensions/browser/install_observer.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/install_observer.h" +#include "extensions/browser/install_observer.h" #include "extensions/buildflags/buildflags.h"
diff --git a/chrome/browser/extensions/install_observer.h b/extensions/browser/install_observer.h similarity index 87% rename from chrome/browser/extensions/install_observer.h rename to extensions/browser/install_observer.h index c980395..ebd0b117 100644 --- a/chrome/browser/extensions/install_observer.h +++ b/extensions/browser/install_observer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_EXTENSIONS_INSTALL_OBSERVER_H_ -#define CHROME_BROWSER_EXTENSIONS_INSTALL_OBSERVER_H_ +#ifndef EXTENSIONS_BROWSER_INSTALL_OBSERVER_H_ +#define EXTENSIONS_BROWSER_INSTALL_OBSERVER_H_ #include <optional> #include <string> @@ -26,11 +26,11 @@ class Extension; -// An InstallObserver observes extension installation events coming from an InstallTracker. -// Since extension installs are scoped to a single Profile (represented here as a -// BrowserContext), InstallTrackers are as well. Instances of InstallObserver are passed the -// appropriate BrowserContext so that a single InstallObserver can observe multiple -// InstallTrackers. +// An InstallObserver observes extension installation events coming from an +// InstallTracker. Since extension installs are scoped to a single Profile +// (represented here as a BrowserContext), InstallTrackers are as well. +// Instances of InstallObserver are passed the appropriate BrowserContext so +// that a single InstallObserver can observe multiple InstallTrackers. class InstallObserver { public: struct ExtensionInstallParams { @@ -97,4 +97,4 @@ } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_INSTALL_OBSERVER_H_ +#endif // EXTENSIONS_BROWSER_INSTALL_OBSERVER_H_
diff --git a/chrome/browser/extensions/install_tracker.cc b/extensions/browser/install_tracker.cc similarity index 94% rename from chrome/browser/extensions/install_tracker.cc rename to extensions/browser/install_tracker.cc index b80d99a8f..2ab2349 100644 --- a/chrome/browser/extensions/install_tracker.cc +++ b/extensions/browser/install_tracker.cc
@@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/install_tracker.h" +#include "extensions/browser/install_tracker.h" #include <memory> #include "base/functional/bind.h" #include "base/observer_list.h" -#include "chrome/browser/extensions/install_tracker_factory.h" #include "components/prefs/pref_change_registrar.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" @@ -38,11 +37,6 @@ InstallTracker::~InstallTracker() = default; -// static -InstallTracker* InstallTracker::Get(content::BrowserContext* context) { - return InstallTrackerFactory::GetForBrowserContext(context); -} - void InstallTracker::AddObserver(InstallObserver* observer) { observers_.AddObserver(observer); }
diff --git a/chrome/browser/extensions/install_tracker.h b/extensions/browser/install_tracker.h similarity index 91% rename from chrome/browser/extensions/install_tracker.h rename to extensions/browser/install_tracker.h index dac5f48..b8b726e 100644 --- a/chrome/browser/extensions/install_tracker.h +++ b/extensions/browser/install_tracker.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_H_ -#define CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_H_ +#ifndef EXTENSIONS_BROWSER_INSTALL_TRACKER_H_ +#define EXTENSIONS_BROWSER_INSTALL_TRACKER_H_ #include <map> #include <optional> @@ -11,12 +11,12 @@ #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h" -#include "chrome/browser/extensions/active_install_data.h" -#include "chrome/browser/extensions/install_observer.h" #include "components/keyed_service/core/keyed_service.h" #include "components/prefs/pref_change_registrar.h" +#include "extensions/browser/active_install_data.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_observer.h" +#include "extensions/browser/install_observer.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension_id.h" @@ -45,8 +45,6 @@ ~InstallTracker() override; - static InstallTracker* Get(content::BrowserContext* context); - void AddObserver(InstallObserver* observer); void RemoveObserver(InstallObserver* observer); @@ -112,4 +110,4 @@ } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_H_ +#endif // EXTENSIONS_BROWSER_INSTALL_TRACKER_H_
diff --git a/chrome/browser/extensions/install_tracker_unittest.cc b/extensions/browser/install_tracker_unittest.cc similarity index 88% rename from chrome/browser/extensions/install_tracker_unittest.cc rename to extensions/browser/install_tracker_unittest.cc index 9a9a90f..6ad1291 100644 --- a/chrome/browser/extensions/install_tracker_unittest.cc +++ b/extensions/browser/install_tracker_unittest.cc
@@ -2,28 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/install_tracker.h" +#include "extensions/browser/install_tracker.h" #include <memory> #include "base/files/file_path.h" #include "base/memory/ptr_util.h" -#include "chrome/browser/extensions/active_install_data.h" -#include "chrome/browser/extensions/scoped_active_install.h" -#include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h" +#include "content/public/test/test_browser_context.h" +#include "extensions/browser/active_install_data.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extensions_test.h" +#include "extensions/browser/scoped_active_install.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" -using extensions::ActiveInstallData; -using extensions::Extension; -using extensions::ExtensionRegistry; -using extensions::InstallTracker; -using extensions::InstallObserver; -using extensions::ScopedActiveInstall; +namespace extensions { namespace { @@ -41,17 +37,24 @@ } // namespace -class InstallTrackerTest : public testing::Test { +class InstallTrackerTest : public ExtensionsTest { public: - InstallTrackerTest() { - profile_ = std::make_unique<TestingProfile>(); - tracker_ = base::WrapUnique(new InstallTracker(profile_.get(), nullptr)); + InstallTrackerTest() = default; + + void SetUp() override { + ExtensionsTest::SetUp(); + + tracker_ = base::WrapUnique(new InstallTracker(browser_context(), nullptr)); + } + + void TearDown() override { + tracker_.reset(); + ExtensionsTest::TearDown(); } ~InstallTrackerTest() override = default; protected: - Profile* profile() { return profile_.get(); } InstallTracker* tracker() { return tracker_.get(); } void VerifyInstallData(const ActiveInstallData& original, @@ -60,8 +63,6 @@ EXPECT_EQ(original.percent_downloaded, retrieved.percent_downloaded); } - content::BrowserTaskEnvironment task_environment_; - std::unique_ptr<TestingProfile> profile_; std::unique_ptr<InstallTracker> tracker_; }; @@ -198,10 +199,12 @@ scoped_refptr<const Extension> extension = CreateDummyExtension(kExtensionId1); ASSERT_TRUE(extension.get()); - ExtensionRegistry* registry = ExtensionRegistry::Get(profile()); + ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context()); ASSERT_TRUE(registry); registry->AddEnabled(extension); registry->TriggerOnInstalled(extension.get(), false); EXPECT_FALSE(tracker_->GetActiveInstall(kExtensionId1)); } + +} // namespace extensions
diff --git a/chrome/browser/extensions/scoped_active_install.cc b/extensions/browser/scoped_active_install.cc similarity index 84% rename from chrome/browser/extensions/scoped_active_install.cc rename to extensions/browser/scoped_active_install.cc index c05f1da4..6a51301 100644 --- a/chrome/browser/extensions/scoped_active_install.cc +++ b/extensions/browser/scoped_active_install.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/scoped_active_install.h" +#include "extensions/browser/scoped_active_install.h" -#include "chrome/browser/extensions/active_install_data.h" +#include "extensions/browser/active_install_data.h" +#include "extensions/buildflags/buildflags.h" + +static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE)); namespace extensions {
diff --git a/chrome/browser/extensions/scoped_active_install.h b/extensions/browser/scoped_active_install.h similarity index 84% rename from chrome/browser/extensions/scoped_active_install.h rename to extensions/browser/scoped_active_install.h index 66619d72..2ba029e 100644 --- a/chrome/browser/extensions/scoped_active_install.h +++ b/extensions/browser/scoped_active_install.h
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_EXTENSIONS_SCOPED_ACTIVE_INSTALL_H_ -#define CHROME_BROWSER_EXTENSIONS_SCOPED_ACTIVE_INSTALL_H_ +#ifndef EXTENSIONS_BROWSER_SCOPED_ACTIVE_INSTALL_H_ +#define EXTENSIONS_BROWSER_SCOPED_ACTIVE_INSTALL_H_ #include <string> #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" -#include "chrome/browser/extensions/install_observer.h" -#include "chrome/browser/extensions/install_tracker.h" +#include "extensions/browser/install_observer.h" +#include "extensions/browser/install_tracker.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/extension_id.h" @@ -55,4 +55,4 @@ } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_SCOPED_ACTIVE_INSTALL_H_ +#endif // EXTENSIONS_BROWSER_SCOPED_ACTIVE_INSTALL_H_
diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc index f7da571c..10eabab 100644 --- a/extensions/common/extension_features.cc +++ b/extensions/common/extension_features.cc
@@ -153,6 +153,7 @@ base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kExtensionBrowserNamespaceAlternative, + "ExtensionBrowserNamespaceAlternative", base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kOptimizeServiceWorkerStartRequests, @@ -165,6 +166,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kRuntimeOnMessageWebExtensionPolyfillSupport, + "RuntimeOnMessageWebExtensionPolyfillSupport", base::FEATURE_DISABLED_BY_DEFAULT); } // namespace extensions_features
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index 0d5e199..1e1c0f1 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn
@@ -517,6 +517,7 @@ "ipc/client/image_decode_accelerator_proxy_unittest.cc", "ipc/common/mojom_traits_unittest.cc", "ipc/host/gpu_disk_cache_unittest.cc", + "ipc/host/persistent_cache_sandboxed_file_factory_unittest.cc", "ipc/service/gpu_channel_test_common.cc", "ipc/service/gpu_channel_test_common.h", "ipc/service/gpu_watchdog_thread_unittest.cc",
diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc index 616c93d..6233e97 100644 --- a/gpu/config/gpu_finch_features.cc +++ b/gpu/config/gpu_finch_features.cc
@@ -50,9 +50,6 @@ } // namespace -// Used to limit GL version to 2.0 for skia raster and compositing. -BASE_FEATURE(kUseGles2ForOopR, base::FEATURE_DISABLED_BY_DEFAULT); - // More aggressive behavior for the shader cache: increase size, and do not // purge as much in case of memory pressure. BASE_FEATURE(kAggressiveShaderCacheLimits, base::FEATURE_DISABLED_BY_DEFAULT); @@ -431,7 +428,7 @@ if (gl::UsePassthroughCommandDecoder(base::CommandLine::ForCurrentProcess())) return true; #endif - return base::FeatureList::IsEnabled(features::kUseGles2ForOopR); + return false; } bool IsUsingVulkan() {
diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h index 06c52d6..a614e285 100644 --- a/gpu/config/gpu_finch_features.h +++ b/gpu/config/gpu_finch_features.h
@@ -23,8 +23,6 @@ namespace features { -GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR); - // All features in alphabetical order. The features should be documented // alongside the definition of their values in the .cc file. GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits);
diff --git a/gpu/ipc/host/BUILD.gn b/gpu/ipc/host/BUILD.gn index 57d4d8d..7eb768e 100644 --- a/gpu/ipc/host/BUILD.gn +++ b/gpu/ipc/host/BUILD.gn
@@ -8,6 +8,8 @@ sources = [ "gpu_disk_cache.cc", "gpu_disk_cache.h", + "persistent_cache_sandboxed_file_factory.cc", + "persistent_cache_sandboxed_file_factory.h", ] deps = [
diff --git a/gpu/ipc/host/persistent_cache_sandboxed_file_factory.cc b/gpu/ipc/host/persistent_cache_sandboxed_file_factory.cc new file mode 100644 index 0000000..9019eac --- /dev/null +++ b/gpu/ipc/host/persistent_cache_sandboxed_file_factory.cc
@@ -0,0 +1,179 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "gpu/ipc/host/persistent_cache_sandboxed_file_factory.h" + +#include "base/files/file_enumerator.h" +#include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/logging.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" +#include "base/task/task_traits.h" + +namespace gpu { + +namespace { + +struct PersistentCacheFilePaths { + base::FilePath db_path; + base::FilePath journal_path; +}; + +std::string GetVersionSuffix(const std::string& product) { + // Use produce's version to differentiate the cache files. + // TODO(crbug.com/399642827): Use Dawn/ANGLE/Skia's versions which change less + // often. The product string may contain characters that are not valid in a + // filename, so it must be sanitized. + std::string version_suffix = product; + base::ReplaceChars(version_suffix, "/\\", "_", &version_suffix); + return version_suffix; +} + +// Returns the paths to the cache database and journal files. The format is: +// <cache_dir>/<cache_id>/<version>/cache.db +// <cache_dir>/<cache_id>/<version>/cache.journal +PersistentCacheFilePaths GetPersistentCacheFilePaths( + const base::FilePath& cache_root_dir, + const base::FilePath::StringType& cache_id, + const std::string& product) { + base::FilePath version_dir = + cache_root_dir.Append(cache_id).AppendASCII(GetVersionSuffix(product)); + + return {version_dir.AppendASCII("cache.db"), + version_dir.AppendASCII("cache.journal")}; +} + +// Deletes all files in the cache directory that are associated with the given +// cache_id but are not the current database or journal file. This is to clean +// up stale cache files from previous runs or different product versions. +void DeleteStaleFiles(const base::FilePath& cache_root_dir, + const base::FilePath::StringType& cache_id, + const std::string& product) { + DCHECK(!cache_root_dir.empty()); + + const std::string version_suffix = GetVersionSuffix(product); + + base::FilePath cache_dir = cache_root_dir.Append(cache_id); + if (!base::PathExists(cache_dir)) { + return; + } + + base::FileEnumerator enumerator(cache_dir, false, + base::FileEnumerator::DIRECTORIES); + for (base::FilePath name = enumerator.Next(); !name.empty(); + name = enumerator.Next()) { + if (name.BaseName().MaybeAsASCII() != version_suffix) { + base::DeletePathRecursively(name); + } + } +} + +bool CreateCacheDirectory(const base::FilePath& cache_dir) { + if (!base::CreateDirectory(cache_dir)) { + LOG(ERROR) << "Failed to create cache directory: " << cache_dir; + return false; + } + return true; +} + +} // namespace + +PersistentCacheSandboxedFileFactory::PersistentCacheSandboxedFileFactory( + const base::FilePath& cache_root_dir, + scoped_refptr<base::SequencedTaskRunner> background_task_runner) + : cache_root_dir_(cache_root_dir), + background_task_runner_(std::move(background_task_runner)) { + if (cache_root_dir_.empty()) { + cache_root_dir_ = base::FilePath(base::FilePath::kCurrentDirectory); + } else { + background_task_runner_->PostTask( + FROM_HERE, + base::BindOnce( + [](const base::FilePath& dir) { CreateCacheDirectory(dir); }, + cache_root_dir_)); + } +} + +PersistentCacheSandboxedFileFactory::~PersistentCacheSandboxedFileFactory() = + default; + +std::optional<PersistentCacheSandboxedFiles> +PersistentCacheSandboxedFileFactory::CreateFiles(const CacheIdString& cache_id, + const std::string& product) { + background_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&DeleteStaleFiles, cache_root_dir_, cache_id, product)); + + DCHECK(!cache_root_dir_.empty()); + + auto paths = GetPersistentCacheFilePaths(cache_root_dir_, cache_id, product); + DCHECK_EQ(paths.db_path.DirName(), paths.journal_path.DirName()); + + if (!CreateCacheDirectory(paths.db_path.DirName())) { + return std::nullopt; + } + + auto open_and_check_file = [](const base::FilePath& path) { + base::File file(path, base::File::FLAG_OPEN_ALWAYS | base::File::FLAG_READ | + base::File::FLAG_WRITE); + if (!file.IsValid()) { + LOG(ERROR) << "Failed to open persistent cache file: " << path + << " error: " + << base::File::ErrorToString(file.error_details()); + } + return file; + }; + + base::File db_file = open_and_check_file(paths.db_path); + if (!db_file.IsValid()) { + return std::nullopt; + } + + base::File journal_file = open_and_check_file(paths.journal_path); + if (!journal_file.IsValid()) { + return std::nullopt; + } + + return PersistentCacheSandboxedFiles{std::move(db_file), + std::move(journal_file)}; +} + +void PersistentCacheSandboxedFileFactory::CreateFilesAsync( + const CacheIdString& cache_id, + const std::string& product, + CreateFilesCallback callback) { + // The reply will be posted to the current SequencedTaskRunner. + background_task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, + base::BindOnce(&PersistentCacheSandboxedFileFactory::CreateFiles, this, + cache_id, product), + std::move(callback)); +} + +bool PersistentCacheSandboxedFileFactory::ClearFiles( + const CacheIdString& cache_id, + const std::string& product) { + DCHECK(!cache_root_dir_.empty()); + + auto paths = GetPersistentCacheFilePaths(cache_root_dir_, cache_id, product); + + // Delete the whole version directory. + DCHECK_EQ(paths.db_path.DirName(), paths.journal_path.DirName()); + return base::DeletePathRecursively(paths.db_path.DirName()); +} + +void PersistentCacheSandboxedFileFactory::ClearFilesAsync( + const CacheIdString& cache_id, + const std::string& product, + ClearFilesCallback callback) { + // The reply will be posted to the current SequencedTaskRunner. + background_task_runner_->PostTaskAndReplyWithResult( + FROM_HERE, + base::BindOnce(&PersistentCacheSandboxedFileFactory::ClearFiles, this, + cache_id, product), + std::move(callback)); +} + +} // namespace gpu
diff --git a/gpu/ipc/host/persistent_cache_sandboxed_file_factory.h b/gpu/ipc/host/persistent_cache_sandboxed_file_factory.h new file mode 100644 index 0000000..76c79fb --- /dev/null +++ b/gpu/ipc/host/persistent_cache_sandboxed_file_factory.h
@@ -0,0 +1,87 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef GPU_IPC_HOST_PERSISTENT_CACHE_SANDBOXED_FILE_FACTORY_H_ +#define GPU_IPC_HOST_PERSISTENT_CACHE_SANDBOXED_FILE_FACTORY_H_ + +#include <optional> +#include <string> + +#include "base/files/file.h" +#include "base/files/file_path.h" +#include "base/functional/callback.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_refptr.h" +#include "base/task/sequenced_task_runner.h" + +namespace gpu { + +struct PersistentCacheSandboxedFiles { + base::File db_file; + base::File journal_file; +}; + +// This class supports opening file handles in a persistent cache directory. +// The handles can be forwarded to the GPU process to load & store blobs. +// +// The persistent cache files are versioned based on the browser's product +// version. When a version change happens, the older versioned files will +// be automatically deleted. TODO(crbug.com/399642827): This is a temporary +// solution until PersistentCache supports max size limit and trimming. +class PersistentCacheSandboxedFileFactory + : public base::RefCountedThreadSafe<PersistentCacheSandboxedFileFactory> { + public: + using CacheIdString = base::FilePath::StringType; + + PersistentCacheSandboxedFileFactory( + const base::FilePath& cache_root_dir, + scoped_refptr<base::SequencedTaskRunner> background_task_runner); + + PersistentCacheSandboxedFileFactory( + const PersistentCacheSandboxedFileFactory&) = delete; + PersistentCacheSandboxedFileFactory& operator=( + const PersistentCacheSandboxedFileFactory&) = delete; + + // Creates the persistent cache database and journal files. + // `cache_id` is used to uniquely identify the cache type (e.g., + // 'dawngraphite'). `product` is the browser product string, used for + // versioning. Stale files from different versions are automatically deleted. + std::optional<PersistentCacheSandboxedFiles> CreateFiles( + const CacheIdString& cache_id, + const std::string& product); + + using CreateFilesCallback = + base::OnceCallback<void(std::optional<PersistentCacheSandboxedFiles>)>; + // Similar to CreateFiles but will do asynchronously using + // background_task_runner_. The `callback` will be triggered on the current + // thread's task runner once the deletion is completed. + void CreateFilesAsync(const CacheIdString& cache_id, + const std::string& product, + CreateFilesCallback callback); + + // Deletes the persistent cache files. + // `cache_id` is the unique identifier for the cache type. + // `product` is the browser product string, used to identify the specific + // version of the cache files to delete. + bool ClearFiles(const CacheIdString& cache_id, const std::string& product); + + using ClearFilesCallback = base::OnceCallback<void(bool)>; + // Similar to ClearFiles but will do asynchronously using + // background_task_runner_. The `callback` will be triggered on the current + // thread's task runner once the deletion is completed. + void ClearFilesAsync(const CacheIdString& cache_id, + const std::string& product, + ClearFilesCallback callback); + + private: + friend class base::RefCountedThreadSafe<PersistentCacheSandboxedFileFactory>; + ~PersistentCacheSandboxedFileFactory(); + + base::FilePath cache_root_dir_; + scoped_refptr<base::SequencedTaskRunner> background_task_runner_; +}; + +} // namespace gpu + +#endif // GPU_IPC_HOST_PERSISTENT_CACHE_SANDBOXED_FILE_FACTORY_H_
diff --git a/gpu/ipc/host/persistent_cache_sandboxed_file_factory_unittest.cc b/gpu/ipc/host/persistent_cache_sandboxed_file_factory_unittest.cc new file mode 100644 index 0000000..7206e420 --- /dev/null +++ b/gpu/ipc/host/persistent_cache_sandboxed_file_factory_unittest.cc
@@ -0,0 +1,196 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "gpu/ipc/host/persistent_cache_sandboxed_file_factory.h" + +#include "base/files/file_enumerator.h" +#include "base/files/file_util.h" +#include "base/files/scoped_temp_dir.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/test/task_environment.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace gpu { + +namespace { + +// RAII class to save and restore the current directory. +class ScopedCurrentDirectory { + public: + explicit ScopedCurrentDirectory(const base::FilePath& new_current_dir) { + CHECK(base::GetCurrentDirectory(&original_cwd_)); + CHECK(base::SetCurrentDirectory(new_current_dir)); + } + + ~ScopedCurrentDirectory() { CHECK(base::SetCurrentDirectory(original_cwd_)); } + + private: + base::FilePath original_cwd_; +}; + +const base::FilePath::StringType kCacheId = FILE_PATH_LITERAL("123"); +const std::string kProduct = "Chrome/1.0.0.0"; + +std::vector<base::FilePath> GetDirsInDir(const base::FilePath& dir) { + std::vector<base::FilePath> dirs; + base::FileEnumerator e(dir, false, base::FileEnumerator::DIRECTORIES); + for (base::FilePath name = e.Next(); !name.empty(); name = e.Next()) { + dirs.push_back(name); + } + return dirs; +} + +} // namespace + +class PersistentCacheSandboxedFileFactoryTest : public testing::Test { + public: + void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } + + const base::FilePath& cache_root_path() const { return temp_dir_.GetPath(); } + + protected: + void FlushMainThreadTasks() { + auto quit = task_environment_.QuitClosure(); + + task_environment_.GetMainThreadTaskRunner()->PostTask(FROM_HERE, quit); + task_environment_.RunUntilQuit(); + } + + base::test::TaskEnvironment task_environment_; + base::ScopedTempDir temp_dir_; +}; + +// Test that PersistentCacheSandboxedFileFactory auto delete old cache files +// after a version change. +TEST_F(PersistentCacheSandboxedFileFactoryTest, DeletesStaleFiles) { + const std::string kOldProduct = kProduct; + const std::string kNewProduct = "Chrome/2.0.0.0"; + const base::FilePath cache_dir = cache_root_path().Append(kCacheId); + + // Create old, stale cache files. + auto factory_old = base::MakeRefCounted<PersistentCacheSandboxedFileFactory>( + cache_root_path(), task_environment_.GetMainThreadTaskRunner()); + auto files_old = factory_old->CreateFiles(kCacheId, kOldProduct); + ASSERT_TRUE(files_old); + files_old.reset(); // Close the files. + + // There should be one version directory for the old product. + ASSERT_EQ(1u, GetDirsInDir(cache_dir).size()); + const base::FilePath old_version_dir = GetDirsInDir(cache_dir)[0]; + EXPECT_TRUE(base::PathExists(old_version_dir)); + + // Create a file for a different client ID that should not be deleted. + const base::FilePath::StringType kOtherCacheId = FILE_PATH_LITERAL("456"); + const base::FilePath other_cache_dir = + cache_root_path().Append(kOtherCacheId); + auto factory_other = + base::MakeRefCounted<PersistentCacheSandboxedFileFactory>( + cache_root_path(), task_environment_.GetMainThreadTaskRunner()); + auto files_other = factory_other->CreateFiles(kOtherCacheId, kOldProduct); + ASSERT_TRUE(files_other); + files_other.reset(); // Close the file. + ASSERT_EQ(1u, GetDirsInDir(other_cache_dir).size()); + + // Wait for any async tasks to complete. + FlushMainThreadTasks(); + + // The old version directory for the first client should still exist. + EXPECT_TRUE(base::PathExists(old_version_dir)); + + // Now, create a factory for the new version. This should trigger the async + // deletion of the stale files for kCacheId. + auto factory_new = base::MakeRefCounted<PersistentCacheSandboxedFileFactory>( + cache_root_path(), task_environment_.GetMainThreadTaskRunner()); + auto files_new = factory_new->CreateFiles(kCacheId, kNewProduct); + ASSERT_TRUE(files_new); + + // Wait for the async deletion task to complete. + FlushMainThreadTasks(); + + // Verify the stale version for kCacheId is gone. + EXPECT_FALSE(base::PathExists(old_version_dir)); + EXPECT_EQ(1u, GetDirsInDir(cache_dir).size()); + + // Verify the other client's directory is untouched. + EXPECT_EQ(1u, GetDirsInDir(other_cache_dir).size()); + + // Verify the root cache directory still contains two client directories. + EXPECT_EQ(2u, GetDirsInDir(cache_root_path()).size()); +} + +TEST_F(PersistentCacheSandboxedFileFactoryTest, ClearFiles) { + const base::FilePath cache_dir = cache_root_path().Append(kCacheId); + + // Create cache files. + auto factory = base::MakeRefCounted<PersistentCacheSandboxedFileFactory>( + cache_root_path(), task_environment_.GetMainThreadTaskRunner()); + auto files = factory->CreateFiles(kCacheId, kProduct); + ASSERT_TRUE(files); + files.reset(); // Close the files. + + // Verify a version directory exists. + ASSERT_EQ(1u, GetDirsInDir(cache_dir).size()); + + // Clear the files. + EXPECT_TRUE(factory->ClearFiles(kCacheId, kProduct)); + + // Verify the version directory is gone. + EXPECT_EQ(0u, GetDirsInDir(cache_dir).size()); +} + +TEST_F(PersistentCacheSandboxedFileFactoryTest, ClearFilesAsync) { + const base::FilePath cache_dir = cache_root_path().Append(kCacheId); + + // Create cache files. + auto factory = base::MakeRefCounted<PersistentCacheSandboxedFileFactory>( + cache_root_path(), task_environment_.GetMainThreadTaskRunner()); + auto files = factory->CreateFiles(kCacheId, kProduct); + ASSERT_TRUE(files); + files.reset(); // Close the files. + + // Verify a version directory exists. + ASSERT_EQ(1u, GetDirsInDir(cache_dir).size()); + + // Clear the files asynchronously. + bool callback_result = false; + factory->ClearFilesAsync( + kCacheId, kProduct, + base::BindOnce([](bool* result, bool success) { *result = success; }, + &callback_result) + .Then(task_environment_.QuitClosure())); + + // Wait for the async deletion task to complete. + task_environment_.RunUntilQuit(); + + EXPECT_TRUE(callback_result); + + // Verify the version directory is gone. + EXPECT_EQ(0u, GetDirsInDir(cache_dir).size()); +} + +// Test that the factory correctly uses the current working directory when an +// empty root path is provided. +TEST_F(PersistentCacheSandboxedFileFactoryTest, + CreateFiles_EmptyRootPath_UsesCurrentDirectory) { + ScopedCurrentDirectory scoped_cwd(cache_root_path()); + + auto factory = base::MakeRefCounted<PersistentCacheSandboxedFileFactory>( + /*cache_root_dir=*/base::FilePath(), + task_environment_.GetMainThreadTaskRunner()); + + auto files = factory->CreateFiles(kCacheId, kProduct); + ASSERT_TRUE(files); + EXPECT_TRUE(files->db_file.IsValid()); + EXPECT_TRUE(files->journal_file.IsValid()); + + // Close the files so we can check the paths. + files->db_file.Close(); + files->journal_file.Close(); + + // The factory should have used the current directory. + EXPECT_TRUE(base::PathExists(cache_root_path().Append(kCacheId))); +} + +} // namespace gpu
diff --git a/infra/config/generated/builders/build/Mac Builder Siso FYI/targets/chromium.build.fyi.json b/infra/config/generated/builders/build/Mac Builder Siso FYI/targets/chromium.build.fyi.json index baa67da2..f1573cc 100644 --- a/infra/config/generated/builders/build/Mac Builder Siso FYI/targets/chromium.build.fyi.json +++ b/infra/config/generated/builders/build/Mac Builder Siso FYI/targets/chromium.build.fyi.json
@@ -1826,6 +1826,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1900,6 +1901,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/build/Mac Tests Siso FYI/targets/chromium.build.fyi.json b/infra/config/generated/builders/build/Mac Tests Siso FYI/targets/chromium.build.fyi.json index 3435666c..67f0b01 100644 --- a/infra/config/generated/builders/build/Mac Tests Siso FYI/targets/chromium.build.fyi.json +++ b/infra/config/generated/builders/build/Mac Tests Siso FYI/targets/chromium.build.fyi.json
@@ -1798,6 +1798,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1872,6 +1873,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git "a/infra/config/generated/builders/ci/Android FYI Experimental Release \050Pixel 6\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Experimental Release \050Pixel 6\051/targets/chromium.gpu.fyi.json" index 9e29e88..20176e1b 100644 --- "a/infra/config/generated/builders/ci/Android FYI Experimental Release \050Pixel 6\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Experimental Release \050Pixel 6\051/targets/chromium.gpu.fyi.json"
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -230,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -270,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -314,6 +317,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -363,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -412,6 +417,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -457,6 +463,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -497,6 +504,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -543,6 +551,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -587,6 +596,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -636,6 +646,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -685,6 +696,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -731,6 +743,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -772,6 +785,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -813,6 +827,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -853,6 +868,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -893,6 +909,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_graphite_tests", "resultdb": { "enable": true, @@ -933,6 +950,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -974,6 +992,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1016,6 +1035,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1058,6 +1078,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -1100,6 +1121,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_graphite_tests", "resultdb": { "enable": true, @@ -1141,6 +1163,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_graphite_tests", "resultdb": { "enable": true, @@ -1181,6 +1204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android FYI Release \050NVIDIA Shield TV\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Release \050NVIDIA Shield TV\051/targets/chromium.gpu.fyi.json" index ea2200e..474de83 100644 --- "a/infra/config/generated/builders/ci/Android FYI Release \050NVIDIA Shield TV\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Release \050NVIDIA Shield TV\051/targets/chromium.gpu.fyi.json"
@@ -185,6 +185,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -228,6 +229,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -311,6 +314,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -354,6 +358,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -397,6 +402,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -442,6 +448,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -481,6 +488,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -521,6 +529,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android FYI Release \050Pixel 10\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Release \050Pixel 10\051/targets/chromium.gpu.fyi.json" index 798a956..6ed7db3 100644 --- "a/infra/config/generated/builders/ci/Android FYI Release \050Pixel 10\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Release \050Pixel 10\051/targets/chromium.gpu.fyi.json"
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android FYI Release \050Pixel 2\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Release \050Pixel 2\051/targets/chromium.gpu.fyi.json" index 1ffc7e6..48246b6 100644 --- "a/infra/config/generated/builders/ci/Android FYI Release \050Pixel 2\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Release \050Pixel 2\051/targets/chromium.gpu.fyi.json"
@@ -194,6 +194,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -240,6 +241,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -282,6 +284,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -325,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_validating_tests", "resultdb": { "enable": true, @@ -367,6 +371,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android FYI Release \050Pixel 4\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Release \050Pixel 4\051/targets/chromium.gpu.fyi.json" index d75733e..08f169706 100644 --- "a/infra/config/generated/builders/ci/Android FYI Release \050Pixel 4\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Release \050Pixel 4\051/targets/chromium.gpu.fyi.json"
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_webview", + "module_scheme": "flat", "name": "android_webview_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -233,6 +234,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -315,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -363,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -407,6 +412,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -489,6 +496,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -532,6 +540,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -580,6 +589,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -625,6 +635,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -665,6 +676,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -704,6 +716,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -743,6 +756,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -784,6 +798,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -826,6 +841,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_validating_tests", "resultdb": { "enable": true, @@ -867,6 +883,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -908,6 +925,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -948,6 +966,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android FYI Release \050Pixel 6\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Release \050Pixel 6\051/targets/chromium.gpu.fyi.json" index ea65aa35..e29bd76 100644 --- "a/infra/config/generated/builders/ci/Android FYI Release \050Pixel 6\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Release \050Pixel 6\051/targets/chromium.gpu.fyi.json"
@@ -185,6 +185,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -224,6 +225,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -263,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -306,6 +309,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -354,6 +358,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -402,6 +407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -530,6 +538,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -573,6 +582,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -621,6 +631,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -669,6 +680,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -714,6 +726,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -754,6 +767,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -794,6 +808,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -833,6 +848,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -872,6 +888,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_graphite_tests", "resultdb": { "enable": true, @@ -911,6 +928,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -951,6 +969,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -992,6 +1011,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1033,6 +1053,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -1074,6 +1095,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_graphite_tests", "resultdb": { "enable": true, @@ -1114,6 +1136,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_graphite_tests", "resultdb": { "enable": true, @@ -1153,6 +1176,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android FYI Release \050Samsung A13\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Release \050Samsung A13\051/targets/chromium.gpu.fyi.json" index bae7999..6a84452 100644 --- "a/infra/config/generated/builders/ci/Android FYI Release \050Samsung A13\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Release \050Samsung A13\051/targets/chromium.gpu.fyi.json"
@@ -192,6 +192,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -237,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -283,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -369,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -414,6 +419,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -461,6 +467,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -502,6 +509,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -544,6 +552,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android FYI Release \050Samsung A23\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Release \050Samsung A23\051/targets/chromium.gpu.fyi.json" index 0005ecde..355f87e2 100644 --- "a/infra/config/generated/builders/ci/Android FYI Release \050Samsung A23\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Release \050Samsung A23\051/targets/chromium.gpu.fyi.json"
@@ -192,6 +192,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -237,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -283,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -369,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -414,6 +419,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -461,6 +467,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -502,6 +509,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -544,6 +552,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android FYI Release \050Samsung S23\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Android FYI Release \050Samsung S23\051/targets/chromium.gpu.fyi.json" index 26a8f47..441ba015 100644 --- "a/infra/config/generated/builders/ci/Android FYI Release \050Samsung S23\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Android FYI Release \050Samsung S23\051/targets/chromium.gpu.fyi.json"
@@ -191,6 +191,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -236,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -282,6 +284,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -323,6 +326,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -413,6 +418,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -460,6 +466,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -501,6 +508,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -543,6 +551,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Android Release \050Pixel 2\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Android Release \050Pixel 2\051/targets/chromium.gpu.json" index 416e0e0..f8e94152 100644 --- "a/infra/config/generated/builders/ci/Android Release \050Pixel 2\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Android Release \050Pixel 2\051/targets/chromium.gpu.json"
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -62,6 +63,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -107,6 +109,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -147,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -191,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -235,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -281,6 +287,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -321,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -362,6 +370,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/ChromeOS FYI Release \050amd64-generic\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/ChromeOS FYI Release \050amd64-generic\051/targets/chromium.gpu.fyi.json" index fb163ed2..f475ba1 100644 --- "a/infra/config/generated/builders/ci/ChromeOS FYI Release \050amd64-generic\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/ChromeOS FYI Release \050amd64-generic\051/targets/chromium.gpu.fyi.json"
@@ -112,6 +112,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -167,6 +168,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -223,6 +225,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -274,6 +277,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -329,6 +333,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -384,6 +389,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -441,6 +447,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -492,6 +499,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -543,6 +551,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -596,6 +605,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -649,6 +659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -701,6 +712,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Android arm Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Android arm Builder/targets/chromium.dawn.json index 9525344..0dfb2d1 100644 --- a/infra/config/generated/builders/ci/Dawn Android arm Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Android arm Builder/targets/chromium.dawn.json
@@ -106,6 +106,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -147,6 +148,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -188,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -230,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Android arm DEPS Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Android arm DEPS Builder/targets/chromium.dawn.json index 1c9198e..a4e290e5e 100644 --- a/infra/config/generated/builders/ci/Dawn Android arm DEPS Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Android arm DEPS Builder/targets/chromium.dawn.json
@@ -106,6 +106,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -147,6 +148,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -188,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -230,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Android arm DEPS Release \050Pixel 4\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Android arm DEPS Release \050Pixel 4\051/targets/chromium.dawn.json" index 1c9198e..a4e290e5e 100644 --- "a/infra/config/generated/builders/ci/Dawn Android arm DEPS Release \050Pixel 4\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Android arm DEPS Release \050Pixel 4\051/targets/chromium.dawn.json"
@@ -106,6 +106,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -147,6 +148,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -188,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -230,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Android arm Release \050Pixel 4\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Android arm Release \050Pixel 4\051/targets/chromium.dawn.json" index 9525344..0dfb2d1 100644 --- "a/infra/config/generated/builders/ci/Dawn Android arm Release \050Pixel 4\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Android arm Release \050Pixel 4\051/targets/chromium.dawn.json"
@@ -106,6 +106,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -147,6 +148,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -188,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -230,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Android arm64 Builder/targets/chromium.dawn.json index 7774e2d..54825c0 100644 --- a/infra/config/generated/builders/ci/Dawn Android arm64 Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Android arm64 Builder/targets/chromium.dawn.json
@@ -107,6 +107,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -149,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -191,6 +193,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -232,6 +235,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -274,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -318,6 +323,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true, @@ -447,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -488,6 +495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -529,6 +537,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -569,6 +578,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -610,6 +620,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -655,6 +666,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Builder/targets/chromium.dawn.json index 91bc7748..e672b0f 100644 --- a/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Builder/targets/chromium.dawn.json
@@ -105,6 +105,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -146,6 +147,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -187,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -227,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -268,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Release \050Pixel 6\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Release \050Pixel 6\051/targets/chromium.dawn.json" index 91bc7748..e672b0f 100644 --- "a/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Release \050Pixel 6\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Android arm64 DEPS Release \050Pixel 6\051/targets/chromium.dawn.json"
@@ -105,6 +105,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -146,6 +147,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -187,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -227,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -268,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Android arm64 Experimental Release \050Pixel 6\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Android arm64 Experimental Release \050Pixel 6\051/targets/chromium.dawn.json" index 1184b643..ff5205b8 100644 --- "a/infra/config/generated/builders/ci/Dawn Android arm64 Experimental Release \050Pixel 6\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Android arm64 Experimental Release \050Pixel 6\051/targets/chromium.dawn.json"
@@ -107,6 +107,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -149,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -191,6 +193,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -232,6 +235,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -274,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Pixel 10\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Pixel 10\051/targets/chromium.dawn.json" index a58f631..936b7754 100644 --- "a/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Pixel 10\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Pixel 10\051/targets/chromium.dawn.json"
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Pixel 6\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Pixel 6\051/targets/chromium.dawn.json" index 492dbe9..709359a 100644 --- "a/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Pixel 6\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Pixel 6\051/targets/chromium.dawn.json"
@@ -105,6 +105,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -146,6 +147,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -187,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -227,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -268,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Samsung S24\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Samsung S24\051/targets/chromium.dawn.json" index 1588e73..478dc4cd 100644 --- "a/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Samsung S24\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Android arm64 Release \050Samsung S24\051/targets/chromium.dawn.json"
@@ -20,6 +20,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Chromium Presubmit/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Chromium Presubmit/targets/chromium.dawn.json index f555903f..a2fde44 100644 --- a/infra/config/generated/builders/ci/Dawn Chromium Presubmit/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Chromium Presubmit/targets/chromium.dawn.json
@@ -6,6 +6,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Linux x64 Builder/targets/chromium.dawn.json index e39b8b90..5954c8a 100644 --- a/infra/config/generated/builders/ci/Dawn Linux x64 Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Linux x64 Builder/targets/chromium.dawn.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": { @@ -284,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -387,6 +389,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -425,6 +428,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -464,6 +468,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -502,6 +507,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -540,6 +546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -577,6 +584,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -616,6 +624,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -723,6 +732,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -764,6 +774,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1026,6 +1037,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1128,6 +1140,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -1165,6 +1178,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1204,6 +1218,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1308,6 +1323,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1349,6 +1365,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1619,6 +1636,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1722,6 +1740,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -1761,6 +1780,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1799,6 +1819,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -1837,6 +1858,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -1874,6 +1896,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1913,6 +1936,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -2020,6 +2044,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -2061,6 +2086,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -2323,6 +2349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2423,6 +2450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -2460,6 +2488,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -2498,6 +2527,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -2535,6 +2565,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -2572,6 +2603,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -2608,6 +2640,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -2646,6 +2679,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -2750,6 +2784,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -2790,6 +2825,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/targets/chromium.dawn.json index 0d9bbed..b9aebc92 100644 --- a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Builder/targets/chromium.dawn.json
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -341,6 +342,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -378,6 +380,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -417,6 +420,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -521,6 +525,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -562,6 +567,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -823,6 +829,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -923,6 +930,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -960,6 +968,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -998,6 +1007,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1035,6 +1045,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -1072,6 +1083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -1108,6 +1120,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1146,6 +1159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1250,6 +1264,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1290,6 +1305,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release \050Intel UHD 630\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release \050Intel UHD 630\051/targets/chromium.dawn.json" index 36553f7..5d0229a 100644 --- "a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release \050Intel UHD 630\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release \050Intel UHD 630\051/targets/chromium.dawn.json"
@@ -238,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -377,6 +379,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -416,6 +419,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -520,6 +524,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -561,6 +566,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" index 294dde6..f5028f8 100644 --- "a/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Linux x64 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -238,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -338,6 +339,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -375,6 +377,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -413,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -450,6 +454,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -487,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -523,6 +529,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -561,6 +568,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -665,6 +673,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -705,6 +714,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release \050Intel UHD 630\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release \050Intel UHD 630\051/targets/chromium.dawn.json" index 5a33714..1f1e2d8 100644 --- "a/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release \050Intel UHD 630\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release \050Intel UHD 630\051/targets/chromium.dawn.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": {
diff --git "a/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release \050NVIDIA GTX 1660\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release \050NVIDIA GTX 1660\051/targets/chromium.dawn.json" index 99e2fac..a0ced6a 100644 --- "a/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release \050NVIDIA GTX 1660\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Linux x64 Experimental Release \050NVIDIA GTX 1660\051/targets/chromium.dawn.json"
@@ -246,6 +246,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -349,6 +350,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -387,6 +389,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -426,6 +429,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -464,6 +468,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -502,6 +507,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -539,6 +545,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -578,6 +585,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -685,6 +693,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -726,6 +735,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Linux x64 Release \050Intel UHD 630\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Linux x64 Release \050Intel UHD 630\051/targets/chromium.dawn.json" index c7e055c5..1dddd9d 100644 --- "a/infra/config/generated/builders/ci/Dawn Linux x64 Release \050Intel UHD 630\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Linux x64 Release \050Intel UHD 630\051/targets/chromium.dawn.json"
@@ -238,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -377,6 +379,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -416,6 +419,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -520,6 +524,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -561,6 +566,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Linux x64 Release \050Intel UHD 770\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Linux x64 Release \050Intel UHD 770\051/targets/chromium.dawn.json" index 4a1b610..685e2c7 100644 --- "a/infra/config/generated/builders/ci/Dawn Linux x64 Release \050Intel UHD 770\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Linux x64 Release \050Intel UHD 770\051/targets/chromium.dawn.json"
@@ -247,6 +247,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -350,6 +351,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -389,6 +391,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -427,6 +430,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -465,6 +469,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -502,6 +507,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -541,6 +547,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -648,6 +655,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -689,6 +697,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Linux x64 Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Linux x64 Release \050NVIDIA\051/targets/chromium.dawn.json" index 4d3e879..af9347d9 100644 --- "a/infra/config/generated/builders/ci/Dawn Linux x64 Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Linux x64 Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -238,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -338,6 +339,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -375,6 +377,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -413,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -450,6 +454,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -487,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -523,6 +529,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -561,6 +568,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -665,6 +673,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -705,6 +714,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Mac arm64 Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Mac arm64 Builder/targets/chromium.dawn.json index 1a2c06e..b810606 100644 --- a/infra/config/generated/builders/ci/Dawn Mac arm64 Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Mac arm64 Builder/targets/chromium.dawn.json
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": { @@ -302,6 +303,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -411,6 +413,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -452,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -493,6 +497,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -533,6 +538,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -575,6 +581,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -687,6 +694,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -731,6 +739,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Builder/targets/chromium.dawn.json index c247fad4..d6db9a8 100644 --- a/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Builder/targets/chromium.dawn.json
@@ -263,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -413,6 +415,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -454,6 +457,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -494,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -536,6 +541,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -648,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -692,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Release \050Apple M2\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Release \050Apple M2\051/targets/chromium.dawn.json" index c247fad4..d6db9a8 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Release \050Apple M2\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac arm64 DEPS Release \050Apple M2\051/targets/chromium.dawn.json"
@@ -263,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -413,6 +415,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -454,6 +457,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -494,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -536,6 +541,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -648,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -692,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Mac arm64 Experimental Release \050Apple M2\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac arm64 Experimental Release \050Apple M2\051/targets/chromium.dawn.json" index 7807582..af13544 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac arm64 Experimental Release \050Apple M2\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac arm64 Experimental Release \050Apple M2\051/targets/chromium.dawn.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": {
diff --git "a/infra/config/generated/builders/ci/Dawn Mac arm64 Release \050Apple M2\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac arm64 Release \050Apple M2\051/targets/chromium.dawn.json" index 065f4b0b..a6ae873 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac arm64 Release \050Apple M2\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac arm64 Release \050Apple M2\051/targets/chromium.dawn.json"
@@ -263,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -413,6 +415,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -454,6 +457,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -494,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -536,6 +541,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -648,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -692,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Mac x64 Builder/targets/chromium.dawn.json index 7b2b8f7..bba013d 100644 --- a/infra/config/generated/builders/ci/Dawn Mac x64 Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Mac x64 Builder/targets/chromium.dawn.json
@@ -264,6 +264,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -414,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -526,6 +529,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -570,6 +574,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -844,6 +849,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -946,6 +952,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -986,6 +993,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1092,6 +1100,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1134,6 +1143,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1414,6 +1424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1519,6 +1530,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1560,6 +1572,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1669,6 +1682,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1712,6 +1726,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1977,6 +1992,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2076,6 +2092,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -2115,6 +2132,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -2218,6 +2236,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -2259,6 +2278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/targets/chromium.dawn.json index 6355af1..1d929f0 100644 --- a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Builder/targets/chromium.dawn.json
@@ -256,6 +256,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -361,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -402,6 +404,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -511,6 +514,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -554,6 +558,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -819,6 +824,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -918,6 +924,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -957,6 +964,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1060,6 +1068,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1101,6 +1110,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release \050AMD\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release \050AMD\051/targets/chromium.dawn.json" index 13b6b0fb..e69c753 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release \050AMD\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release \050AMD\051/targets/chromium.dawn.json"
@@ -255,6 +255,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -360,6 +361,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -401,6 +403,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -510,6 +513,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -553,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release \050Intel\051/targets/chromium.dawn.json" index c86627e..47de3e4 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac x64 DEPS Release \050Intel\051/targets/chromium.dawn.json"
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -338,6 +339,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -377,6 +379,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -480,6 +483,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -521,6 +525,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release \050AMD\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release \050AMD\051/targets/chromium.dawn.json" index e68aa682..ad8e3742 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release \050AMD\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release \050AMD\051/targets/chromium.dawn.json"
@@ -263,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -371,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -413,6 +415,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -525,6 +528,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -569,6 +573,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release \050Intel\051/targets/chromium.dawn.json" index ab3b59b..2d993d13 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac x64 Experimental Release \050Intel\051/targets/chromium.dawn.json"
@@ -247,6 +247,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -349,6 +350,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -389,6 +391,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -495,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -537,6 +541,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Mac x64 Release \050AMD\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac x64 Release \050AMD\051/targets/chromium.dawn.json" index 2892413..282ba27 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac x64 Release \050AMD\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac x64 Release \050AMD\051/targets/chromium.dawn.json"
@@ -255,6 +255,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -360,6 +361,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -401,6 +403,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -510,6 +513,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -553,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Mac x64 Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Mac x64 Release \050Intel\051/targets/chromium.dawn.json" index d17beb8..ab53312 100644 --- "a/infra/config/generated/builders/ci/Dawn Mac x64 Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Mac x64 Release \050Intel\051/targets/chromium.dawn.json"
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -338,6 +339,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -377,6 +379,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -480,6 +483,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -521,6 +525,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Builder/targets/chromium.dawn.json index f151c14..25ae22a 100644 --- a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Builder/targets/chromium.dawn.json
@@ -240,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -378,6 +380,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -704,6 +707,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -804,6 +808,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -842,6 +847,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -881,6 +887,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -919,6 +926,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -956,6 +964,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release \050Intel\051/targets/chromium.dawn.json" index b25dbcf..5f2aac2a 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release \050Intel\051/targets/chromium.dawn.json"
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -339,6 +340,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -377,6 +379,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release \050NVIDIA\051/targets/chromium.dawn.json" index ec52b4e..5aaa8f1 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 ASAN Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -339,6 +340,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -377,6 +379,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -416,6 +419,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -454,6 +458,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -491,6 +496,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Win10 x64 Builder/targets/chromium.dawn.json index 90ac12bb..485f296b 100644 --- a/infra/config/generated/builders/ci/Dawn Win10 x64 Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Win10 x64 Builder/targets/chromium.dawn.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": { @@ -347,6 +348,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -450,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -490,6 +493,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -532,6 +536,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -572,6 +577,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -611,6 +617,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -649,6 +656,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -689,6 +697,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -795,6 +804,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -837,6 +847,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1161,6 +1172,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1261,6 +1273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1300,6 +1313,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -1341,6 +1355,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -1380,6 +1395,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -1418,6 +1434,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -1455,6 +1472,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1494,6 +1512,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1597,6 +1616,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1638,6 +1658,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1960,6 +1981,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2029,6 +2051,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -2070,6 +2093,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -2108,6 +2132,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -2211,6 +2236,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -2533,6 +2559,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2633,6 +2660,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -2672,6 +2700,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -2713,6 +2742,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -2752,6 +2782,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -2790,6 +2821,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -2827,6 +2859,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -2866,6 +2899,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -2969,6 +3003,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -3010,6 +3045,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/targets/chromium.dawn.json index 9a9acf00..4bfb9ff9 100644 --- a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Builder/targets/chromium.dawn.json
@@ -299,6 +299,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -368,6 +369,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -409,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -447,6 +450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -550,6 +554,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -872,6 +877,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -972,6 +978,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1011,6 +1018,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -1052,6 +1060,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -1091,6 +1100,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -1129,6 +1139,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -1166,6 +1177,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1205,6 +1217,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1308,6 +1321,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1349,6 +1363,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release \050Intel\051/targets/chromium.dawn.json" index ada2957f..37046ae5 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release \050Intel\051/targets/chromium.dawn.json"
@@ -298,6 +298,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -367,6 +368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -408,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -446,6 +449,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -549,6 +553,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" index 938b37b..0c05207 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -298,6 +298,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -398,6 +399,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -437,6 +439,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -478,6 +481,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -517,6 +521,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -555,6 +560,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -592,6 +598,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -631,6 +638,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -734,6 +742,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -775,6 +784,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release \050Intel\051/targets/chromium.dawn.json" index cd7784ae..6540dda9 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release \050Intel\051/targets/chromium.dawn.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": {
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release \050NVIDIA\051/targets/chromium.dawn.json" index bc3ec54..ec47d43 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 Experimental Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -309,6 +309,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -412,6 +413,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -452,6 +454,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -494,6 +497,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -534,6 +538,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -573,6 +578,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -611,6 +617,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -651,6 +658,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -757,6 +765,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -799,6 +808,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050Intel UHD 770\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050Intel UHD 770\051/targets/chromium.dawn.json" index 439fd19..45c73a7d5 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050Intel UHD 770\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050Intel UHD 770\051/targets/chromium.dawn.json"
@@ -299,6 +299,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -399,6 +400,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -438,6 +440,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -479,6 +482,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -518,6 +522,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -556,6 +561,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -593,6 +599,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -632,6 +639,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -735,6 +743,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -776,6 +785,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050Intel\051/targets/chromium.dawn.json" index 76c6200..eca94212 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050Intel\051/targets/chromium.dawn.json"
@@ -298,6 +298,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -367,6 +368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -408,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -446,6 +449,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -549,6 +553,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050NVIDIA\051/targets/chromium.dawn.json" index 5be548c4..99ea545 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x64 Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -298,6 +298,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -398,6 +399,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -437,6 +439,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -478,6 +481,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -517,6 +521,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -555,6 +560,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -592,6 +598,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -631,6 +638,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -734,6 +742,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -775,6 +784,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Win10 x86 Builder/targets/chromium.dawn.json index a158b3f..468f224 100644 --- a/infra/config/generated/builders/ci/Dawn Win10 x86 Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Win10 x86 Builder/targets/chromium.dawn.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": { @@ -286,6 +287,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -390,6 +392,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -432,6 +435,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -538,6 +542,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -580,6 +585,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -844,6 +850,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -945,6 +952,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -1048,6 +1056,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1311,6 +1320,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1412,6 +1422,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -1515,6 +1526,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1556,6 +1568,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/targets/chromium.dawn.json b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/targets/chromium.dawn.json index ef46fa8..072053e 100644 --- a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/targets/chromium.dawn.json +++ b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Builder/targets/chromium.dawn.json
@@ -240,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -341,6 +342,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -444,6 +446,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -707,6 +710,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -808,6 +812,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -911,6 +916,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -952,6 +958,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release \050Intel\051/targets/chromium.dawn.json" index 58ab3ad..2538c08 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release \050Intel\051/targets/chromium.dawn.json"
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -443,6 +445,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" index 6db06666..1a83178 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x86 DEPS Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -443,6 +445,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -484,6 +487,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release \050Intel\051/targets/chromium.dawn.json" index e51c3f59..2e5c46a 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release \050Intel\051/targets/chromium.dawn.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": {
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release \050NVIDIA\051/targets/chromium.dawn.json" index 13d1694..45ccbe0b 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x86 Experimental Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -248,6 +248,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -352,6 +353,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -394,6 +396,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -500,6 +503,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -542,6 +546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x86 Release \050Intel\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x86 Release \050Intel\051/targets/chromium.dawn.json" index 37c6d2c..88efd193 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x86 Release \050Intel\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x86 Release \050Intel\051/targets/chromium.dawn.json"
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -443,6 +445,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Dawn Win10 x86 Release \050NVIDIA\051/targets/chromium.dawn.json" "b/infra/config/generated/builders/ci/Dawn Win10 x86 Release \050NVIDIA\051/targets/chromium.dawn.json" index 800f0bb..7a136f1d 100644 --- "a/infra/config/generated/builders/ci/Dawn Win10 x86 Release \050NVIDIA\051/targets/chromium.dawn.json" +++ "b/infra/config/generated/builders/ci/Dawn Win10 x86 Release \050NVIDIA\051/targets/chromium.dawn.json"
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -443,6 +445,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -484,6 +487,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Android arm Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Android arm Builder/targets/chromium.gpu.fyi.json index cf4e4e52..d1e07fd 100644 --- a/infra/config/generated/builders/ci/GPU FYI Android arm Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Android arm Builder/targets/chromium.gpu.fyi.json
@@ -185,6 +185,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -228,6 +229,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -311,6 +314,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -354,6 +358,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -397,6 +402,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -442,6 +448,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -481,6 +488,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -521,6 +529,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true, @@ -741,6 +750,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -787,6 +797,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -829,6 +840,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -872,6 +884,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_validating_tests", "resultdb": { "enable": true, @@ -914,6 +927,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -1130,6 +1144,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_webview", + "module_scheme": "flat", "name": "android_webview_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1174,6 +1189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1213,6 +1229,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -1256,6 +1273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1304,6 +1322,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1348,6 +1367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1387,6 +1407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1430,6 +1451,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -1473,6 +1495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1521,6 +1544,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1566,6 +1590,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1606,6 +1631,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -1645,6 +1671,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -1684,6 +1711,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -1725,6 +1753,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -1767,6 +1796,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_validating_tests", "resultdb": { "enable": true, @@ -1808,6 +1838,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1849,6 +1880,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -1889,6 +1921,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -2106,6 +2139,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -2151,6 +2185,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2197,6 +2232,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2238,6 +2274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2283,6 +2320,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -2328,6 +2366,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2375,6 +2414,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -2416,6 +2456,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -2458,6 +2499,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true, @@ -2677,6 +2719,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -2722,6 +2765,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2768,6 +2812,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2809,6 +2854,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2854,6 +2900,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -2899,6 +2946,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2946,6 +2994,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -2987,6 +3036,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -3029,6 +3079,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/targets/chromium.gpu.fyi.json index 273182b..537c677a 100644 --- a/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Android arm64 Builder/targets/chromium.gpu.fyi.json
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -230,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -270,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -314,6 +317,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -363,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -412,6 +417,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -457,6 +463,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -497,6 +504,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -543,6 +551,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -587,6 +596,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -636,6 +646,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -685,6 +696,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -731,6 +743,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -772,6 +785,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -813,6 +827,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -853,6 +868,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -893,6 +909,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_graphite_tests", "resultdb": { "enable": true, @@ -933,6 +950,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -974,6 +992,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1016,6 +1035,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1058,6 +1078,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -1100,6 +1121,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_graphite_tests", "resultdb": { "enable": true, @@ -1141,6 +1163,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_graphite_tests", "resultdb": { "enable": true, @@ -1181,6 +1204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -1225,6 +1249,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true, @@ -1435,6 +1460,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1474,6 +1500,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1513,6 +1540,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -1556,6 +1584,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1604,6 +1633,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1652,6 +1682,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1696,6 +1727,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1735,6 +1767,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1780,6 +1813,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -1823,6 +1857,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1871,6 +1906,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1919,6 +1955,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1964,6 +2001,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2004,6 +2042,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2044,6 +2083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -2083,6 +2123,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -2122,6 +2163,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_graphite_tests", "resultdb": { "enable": true, @@ -2161,6 +2203,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -2201,6 +2244,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2242,6 +2286,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2283,6 +2328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -2324,6 +2370,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_graphite_tests", "resultdb": { "enable": true, @@ -2364,6 +2411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_graphite_tests", "resultdb": { "enable": true, @@ -2403,6 +2451,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -2619,6 +2668,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -2664,6 +2714,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2710,6 +2761,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2751,6 +2803,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2796,6 +2849,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -2841,6 +2895,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2888,6 +2943,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -2929,6 +2985,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -2971,6 +3028,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/GPU FYI Linux Builder \050dbg\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/GPU FYI Linux Builder \050dbg\051/targets/chromium.gpu.fyi.json" index cc96548..269f351 100644 --- "a/infra/config/generated/builders/ci/GPU FYI Linux Builder \050dbg\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/GPU FYI Linux Builder \050dbg\051/targets/chromium.gpu.fyi.json"
@@ -79,6 +79,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -119,6 +120,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -160,6 +162,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -196,6 +199,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -236,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -276,6 +281,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -318,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -354,6 +361,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -391,6 +399,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Linux Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Linux Builder/targets/chromium.gpu.fyi.json index 7edb69d..78e85d12 100644 --- a/infra/config/generated/builders/ci/GPU FYI Linux Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Linux Builder/targets/chromium.gpu.fyi.json
@@ -196,6 +196,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -238,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -281,6 +283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -319,6 +322,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -361,6 +365,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -403,6 +408,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -447,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -523,6 +531,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -563,6 +572,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -603,6 +613,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -824,6 +835,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -866,6 +878,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -909,6 +922,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -947,6 +961,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -989,6 +1004,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -1031,6 +1047,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1075,6 +1092,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -1113,6 +1131,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -1151,6 +1170,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -1191,6 +1211,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -1231,6 +1252,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -1274,6 +1296,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO", @@ -1312,6 +1335,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO", @@ -1522,6 +1546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1563,6 +1588,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1605,6 +1631,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1642,6 +1669,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1683,6 +1711,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -1724,6 +1753,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1767,6 +1797,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -1804,6 +1835,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -1845,6 +1877,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "vulkan_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1887,6 +1920,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -1926,6 +1960,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -1965,6 +2000,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -2179,6 +2215,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -2220,6 +2257,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2262,6 +2300,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2299,6 +2338,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2340,6 +2380,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -2381,6 +2422,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2424,6 +2466,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -2461,6 +2504,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -2498,6 +2542,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -2537,6 +2582,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -2576,6 +2622,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -2790,6 +2837,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -2831,6 +2879,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2873,6 +2922,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2910,6 +2960,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2951,6 +3002,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -2992,6 +3044,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3035,6 +3088,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -3072,6 +3126,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -3109,6 +3164,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -3148,6 +3204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -3187,6 +3244,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -3367,6 +3425,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -3407,6 +3466,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3448,6 +3508,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -3484,6 +3545,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -3524,6 +3586,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -3564,6 +3627,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3606,6 +3670,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -3642,6 +3707,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -3678,6 +3744,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -3716,6 +3783,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -3754,6 +3822,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -3968,6 +4037,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -4009,6 +4079,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4051,6 +4122,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -4088,6 +4160,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -4129,6 +4202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -4170,6 +4244,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4213,6 +4288,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -4250,6 +4326,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -4287,6 +4364,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -4326,6 +4404,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -4365,6 +4444,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -4545,6 +4625,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -4585,6 +4666,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4626,6 +4708,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -4662,6 +4745,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -4702,6 +4786,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -4742,6 +4827,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4784,6 +4870,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -4820,6 +4907,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -4860,6 +4948,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "vulkan_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4901,6 +4990,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -4939,6 +5029,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -4977,6 +5068,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Linux Wayland Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Linux Wayland Builder/targets/chromium.gpu.fyi.json index 28b5a01..b9610fbc 100644 --- a/infra/config/generated/builders/ci/GPU FYI Linux Wayland Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Linux Wayland Builder/targets/chromium.gpu.fyi.json
@@ -55,6 +55,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO", @@ -129,6 +130,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -173,6 +175,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -218,6 +221,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -258,6 +262,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -302,6 +307,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -346,6 +352,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -392,6 +399,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -432,6 +440,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -472,6 +481,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -513,6 +523,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -554,6 +565,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/GPU FYI Mac Builder \050asan\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/GPU FYI Mac Builder \050asan\051/targets/chromium.gpu.fyi.json" index 5ca16d2..f70dd94 100644 --- "a/infra/config/generated/builders/ci/GPU FYI Mac Builder \050asan\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/GPU FYI Mac Builder \050asan\051/targets/chromium.gpu.fyi.json"
@@ -178,6 +178,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -215,6 +216,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -252,6 +254,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -293,6 +296,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -339,6 +343,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -385,6 +390,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -427,6 +433,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -464,6 +471,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -505,6 +513,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -546,6 +555,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -593,6 +603,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -640,6 +651,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -684,6 +696,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -722,6 +735,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -760,6 +774,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -797,6 +812,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -835,6 +851,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -872,6 +889,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -909,6 +927,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -948,6 +967,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -987,6 +1007,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1026,6 +1047,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1063,6 +1085,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1100,6 +1123,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1137,6 +1161,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1350,6 +1375,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1393,6 +1419,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1441,6 +1468,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1486,6 +1514,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1525,6 +1554,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1566,6 +1596,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1607,6 +1638,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1648,6 +1680,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1687,6 +1720,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1726,6 +1760,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1765,6 +1800,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/GPU FYI Mac Builder \050dbg\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/GPU FYI Mac Builder \050dbg\051/targets/chromium.gpu.fyi.json" index b8dfc2f..989c7b4 100644 --- "a/infra/config/generated/builders/ci/GPU FYI Mac Builder \050dbg\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/GPU FYI Mac Builder \050dbg\051/targets/chromium.gpu.fyi.json"
@@ -150,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -191,6 +192,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -233,6 +235,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -270,6 +273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -311,6 +315,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -352,6 +357,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -396,6 +402,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -433,6 +440,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -471,6 +479,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -655,6 +664,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -698,6 +708,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -742,6 +753,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -781,6 +793,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -824,6 +837,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -867,6 +881,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -913,6 +928,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -952,6 +968,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -992,6 +1009,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Mac Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Mac Builder/targets/chromium.gpu.fyi.json index c3e6a73..1574f1c1 100644 --- a/infra/config/generated/builders/ci/GPU FYI Mac Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Mac Builder/targets/chromium.gpu.fyi.json
@@ -184,6 +184,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -222,6 +223,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -260,6 +262,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -302,6 +305,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -349,6 +353,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -396,6 +401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -439,6 +445,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -477,6 +484,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -519,6 +527,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -561,6 +570,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -608,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -655,6 +666,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -699,6 +711,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -738,6 +751,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -777,6 +791,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -815,6 +830,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -853,6 +869,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -891,6 +908,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -929,6 +947,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -969,6 +988,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1011,6 +1031,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1051,6 +1072,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1092,6 +1114,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1132,6 +1155,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1171,6 +1195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1209,6 +1234,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1247,6 +1273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1285,6 +1312,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1505,6 +1533,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1545,6 +1574,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1585,6 +1615,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1629,6 +1660,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1678,6 +1710,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1727,6 +1760,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1772,6 +1806,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1812,6 +1847,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1856,6 +1892,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -1900,6 +1937,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1949,6 +1987,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1998,6 +2037,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2044,6 +2084,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2085,6 +2126,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2126,6 +2168,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2166,6 +2209,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -2206,6 +2250,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2246,6 +2291,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2286,6 +2332,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2328,6 +2375,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2372,6 +2420,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2414,6 +2463,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2457,6 +2507,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2499,6 +2550,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2540,6 +2592,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -2580,6 +2633,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2620,6 +2674,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2660,6 +2715,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2864,6 +2920,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2901,6 +2958,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -2942,6 +3000,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2988,6 +3047,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3030,6 +3090,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -3067,6 +3128,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -3108,6 +3170,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3154,6 +3217,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3197,6 +3261,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3235,6 +3300,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3272,6 +3338,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3309,6 +3376,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3346,6 +3414,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -3385,6 +3454,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3426,6 +3496,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -3465,6 +3536,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3505,6 +3577,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3543,6 +3616,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -3580,6 +3654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3617,6 +3692,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3654,6 +3730,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -3867,6 +3944,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3906,6 +3984,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -3949,6 +4028,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3997,6 +4077,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4041,6 +4122,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -4080,6 +4162,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -4123,6 +4206,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4171,6 +4255,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4216,6 +4301,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4256,6 +4342,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4295,6 +4382,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4334,6 +4422,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4373,6 +4462,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -4414,6 +4504,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4457,6 +4548,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -4498,6 +4590,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4540,6 +4633,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4580,6 +4674,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -4619,6 +4714,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4658,6 +4754,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -4697,6 +4794,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -4879,6 +4977,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -4921,6 +5020,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4964,6 +5064,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -5002,6 +5103,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -5044,6 +5146,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -5086,6 +5189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -5130,6 +5234,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -5168,6 +5273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -5208,6 +5314,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -5248,6 +5355,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Mac arm64 Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Mac arm64 Builder/targets/chromium.gpu.fyi.json index c117ab9..c10dfffa 100644 --- a/infra/config/generated/builders/ci/GPU FYI Mac arm64 Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Mac arm64 Builder/targets/chromium.gpu.fyi.json
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -232,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -276,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -315,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -358,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -401,6 +406,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -524,6 +532,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -566,6 +575,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -608,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -648,6 +659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -687,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -730,6 +743,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO", @@ -943,6 +957,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -986,6 +1001,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1030,6 +1046,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1069,6 +1086,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1112,6 +1130,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -1155,6 +1174,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1200,6 +1220,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1239,6 +1260,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -1278,6 +1300,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1320,6 +1343,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1362,6 +1386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1402,6 +1427,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1441,6 +1467,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1662,6 +1689,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1706,6 +1734,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1751,6 +1780,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1791,6 +1821,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1835,6 +1866,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -1879,6 +1911,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1925,6 +1958,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1965,6 +1999,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -2005,6 +2040,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2048,6 +2084,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2091,6 +2128,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2132,6 +2170,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -2172,6 +2211,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2394,6 +2434,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2438,6 +2479,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2483,6 +2525,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2523,6 +2566,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2567,6 +2611,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -2611,6 +2656,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2657,6 +2703,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2697,6 +2744,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -2737,6 +2785,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2780,6 +2829,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2823,6 +2873,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -2864,6 +2915,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -2904,6 +2956,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Win Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Win Builder/targets/chromium.gpu.fyi.json index 38a1d21a..185fbc7 100644 --- a/infra/config/generated/builders/ci/GPU FYI Win Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Win Builder/targets/chromium.gpu.fyi.json
@@ -203,6 +203,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -240,6 +241,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -281,6 +283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -327,6 +330,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -369,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -406,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -447,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -520,6 +527,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -566,6 +574,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -609,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -647,6 +657,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -684,6 +695,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -721,6 +733,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -760,6 +773,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -799,6 +813,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -838,6 +853,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -876,6 +892,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Win arm64 Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Win arm64 Builder/targets/chromium.gpu.fyi.json index c982854..5fa86a7 100644 --- a/infra/config/generated/builders/ci/GPU FYI Win arm64 Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Win arm64 Builder/targets/chromium.gpu.fyi.json
@@ -219,6 +219,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -262,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -306,6 +308,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -345,6 +348,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -388,6 +392,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -431,6 +436,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -476,6 +482,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -515,6 +522,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -554,6 +562,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -595,6 +604,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -636,6 +646,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -676,6 +687,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/GPU FYI Win x64 Builder \050dbg\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/GPU FYI Win x64 Builder \050dbg\051/targets/chromium.gpu.fyi.json" index 9837aab..29b081d 100644 --- "a/infra/config/generated/builders/ci/GPU FYI Win x64 Builder \050dbg\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/GPU FYI Win x64 Builder \050dbg\051/targets/chromium.gpu.fyi.json"
@@ -175,6 +175,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -216,6 +217,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -258,6 +260,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -295,6 +298,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -336,6 +340,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -377,6 +382,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -420,6 +426,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -457,6 +464,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -495,6 +503,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -534,6 +543,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU FYI Win x64 Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Win x64 Builder/targets/chromium.gpu.fyi.json index dccf95eb..4d43440 100644 --- a/infra/config/generated/builders/ci/GPU FYI Win x64 Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Win x64 Builder/targets/chromium.gpu.fyi.json
@@ -238,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -276,6 +277,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -318,6 +320,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -365,6 +368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -408,6 +412,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -446,6 +451,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -488,6 +494,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -563,6 +570,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -610,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -654,6 +663,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -693,6 +703,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -731,6 +742,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -769,6 +781,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -809,6 +822,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -849,6 +863,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -889,6 +904,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -929,6 +945,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -968,6 +985,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -1010,6 +1028,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO", @@ -1234,6 +1253,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1275,6 +1295,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1317,6 +1338,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1354,6 +1376,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1395,6 +1418,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -1436,6 +1460,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1479,6 +1504,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -1516,6 +1542,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -1553,6 +1580,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -1592,6 +1620,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -1631,6 +1660,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -1670,6 +1700,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -1708,6 +1739,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -1962,6 +1994,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -2003,6 +2036,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2045,6 +2079,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2082,6 +2117,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2123,6 +2159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -2164,6 +2201,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2207,6 +2245,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -2244,6 +2283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -2281,6 +2321,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -2320,6 +2361,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -2359,6 +2401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -2398,6 +2441,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -2437,6 +2481,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -2475,6 +2520,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -2728,6 +2774,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -2769,6 +2816,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2811,6 +2859,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2848,6 +2897,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2889,6 +2939,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -2930,6 +2981,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2973,6 +3025,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -3010,6 +3063,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -3047,6 +3101,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -3086,6 +3141,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -3125,6 +3181,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -3164,6 +3221,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -3203,6 +3261,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -3241,6 +3300,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -3467,6 +3527,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -3504,6 +3565,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -3545,6 +3607,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3591,6 +3654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3633,6 +3697,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -3670,6 +3735,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -3711,6 +3777,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -3784,6 +3851,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3830,6 +3898,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -3873,6 +3942,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -3911,6 +3981,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -3948,6 +4019,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -3985,6 +4057,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -4024,6 +4097,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -4063,6 +4137,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -4102,6 +4177,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -4140,6 +4216,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -4401,6 +4478,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -4443,6 +4521,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4486,6 +4565,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -4524,6 +4604,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -4566,6 +4647,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -4608,6 +4690,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -4652,6 +4735,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -4690,6 +4774,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -4728,6 +4813,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -4768,6 +4854,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -4808,6 +4895,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -4848,6 +4936,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -4887,6 +4976,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -5149,6 +5239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -5191,6 +5282,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -5234,6 +5326,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -5272,6 +5365,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -5314,6 +5408,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -5356,6 +5451,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -5400,6 +5496,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -5438,6 +5535,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -5476,6 +5574,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -5516,6 +5615,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -5556,6 +5656,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -5596,6 +5697,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -5635,6 +5737,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -5677,6 +5780,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO", @@ -5934,6 +6038,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -5972,6 +6077,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -6014,6 +6120,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -6061,6 +6168,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -6104,6 +6212,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -6142,6 +6251,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -6184,6 +6294,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -6259,6 +6370,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -6306,6 +6418,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -6350,6 +6463,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -6389,6 +6503,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -6427,6 +6542,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -6465,6 +6581,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -6505,6 +6622,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -6545,6 +6663,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -6585,6 +6704,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -6625,6 +6745,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -6664,6 +6785,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -6919,6 +7041,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -6960,6 +7083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -7002,6 +7126,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -7039,6 +7164,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -7080,6 +7206,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -7121,6 +7248,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -7164,6 +7292,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -7201,6 +7330,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -7238,6 +7368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -7277,6 +7408,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -7316,6 +7448,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -7355,6 +7488,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -7393,6 +7527,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true, @@ -7653,6 +7788,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -7691,6 +7827,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -7733,6 +7870,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -7780,6 +7918,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -7823,6 +7962,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -7861,6 +8001,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -7903,6 +8044,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -7978,6 +8120,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -8025,6 +8168,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -8069,6 +8213,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -8108,6 +8253,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -8146,6 +8292,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -8184,6 +8331,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -8224,6 +8372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -8264,6 +8413,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -8304,6 +8454,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -8344,6 +8495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -8383,6 +8535,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/GPU FYI Win x64 DX12 Vulkan Builder \050dbg\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/GPU FYI Win x64 DX12 Vulkan Builder \050dbg\051/targets/chromium.gpu.fyi.json" index 470cb69..53db6b4 100644 --- "a/infra/config/generated/builders/ci/GPU FYI Win x64 DX12 Vulkan Builder \050dbg\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/GPU FYI Win x64 DX12 Vulkan Builder \050dbg\051/targets/chromium.gpu.fyi.json"
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/ci/GPU FYI Win x64 DX12 Vulkan Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Win x64 DX12 Vulkan Builder/targets/chromium.gpu.fyi.json index 3250094..70ef9ea 100644 --- a/infra/config/generated/builders/ci/GPU FYI Win x64 DX12 Vulkan Builder/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/ci/GPU FYI Win x64 DX12 Vulkan Builder/targets/chromium.gpu.fyi.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/GPU Linux Builder \050dbg\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/GPU Linux Builder \050dbg\051/targets/chromium.gpu.json" index d0329fc0..1977311b 100644 --- "a/infra/config/generated/builders/ci/GPU Linux Builder \050dbg\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/GPU Linux Builder \050dbg\051/targets/chromium.gpu.json"
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -144,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -185,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -221,6 +224,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -261,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -301,6 +306,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -379,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -416,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU Linux Builder/targets/chromium.gpu.json b/infra/config/generated/builders/ci/GPU Linux Builder/targets/chromium.gpu.json index e88f0c46..0c9bddd 100644 --- a/infra/config/generated/builders/ci/GPU Linux Builder/targets/chromium.gpu.json +++ b/infra/config/generated/builders/ci/GPU Linux Builder/targets/chromium.gpu.json
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -144,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -185,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -221,6 +224,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -261,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -301,6 +306,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -379,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -416,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/GPU Mac Builder \050dbg\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/GPU Mac Builder \050dbg\051/targets/chromium.gpu.json" index fa66a8c..eb55e9e 100644 --- "a/infra/config/generated/builders/ci/GPU Mac Builder \050dbg\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/GPU Mac Builder \050dbg\051/targets/chromium.gpu.json"
@@ -105,6 +105,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -147,6 +148,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -190,6 +192,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -228,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -270,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -312,6 +317,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -356,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -394,6 +401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -434,6 +442,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -569,6 +578,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -613,6 +623,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -658,6 +669,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -698,6 +710,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -742,6 +755,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -786,6 +800,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -833,6 +848,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -873,6 +889,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -915,6 +932,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU Mac Builder/targets/chromium.gpu.json b/infra/config/generated/builders/ci/GPU Mac Builder/targets/chromium.gpu.json index d64394d..b7a249ca 100644 --- a/infra/config/generated/builders/ci/GPU Mac Builder/targets/chromium.gpu.json +++ b/infra/config/generated/builders/ci/GPU Mac Builder/targets/chromium.gpu.json
@@ -134,6 +134,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -176,6 +177,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -219,6 +221,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -257,6 +260,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -299,6 +303,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -341,6 +346,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -385,6 +391,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -423,6 +430,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -463,6 +471,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -629,6 +638,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -673,6 +683,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -718,6 +729,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -758,6 +770,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -802,6 +815,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -846,6 +860,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -892,6 +907,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -932,6 +948,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -974,6 +991,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/GPU Win x64 Builder \050dbg\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/GPU Win x64 Builder \050dbg\051/targets/chromium.gpu.json" index b620bec..2283da9 100644 --- "a/infra/config/generated/builders/ci/GPU Win x64 Builder \050dbg\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/GPU Win x64 Builder \050dbg\051/targets/chromium.gpu.json"
@@ -159,6 +159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -201,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -244,6 +246,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -282,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -324,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -366,6 +371,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -410,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -448,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -487,6 +495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/GPU Win x64 Builder/targets/chromium.gpu.json b/infra/config/generated/builders/ci/GPU Win x64 Builder/targets/chromium.gpu.json index 19fe45b..6ca893a 100644 --- a/infra/config/generated/builders/ci/GPU Win x64 Builder/targets/chromium.gpu.json +++ b/infra/config/generated/builders/ci/GPU Win x64 Builder/targets/chromium.gpu.json
@@ -159,6 +159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -201,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -244,6 +246,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -282,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -324,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -366,6 +371,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -410,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -448,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -488,6 +496,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Leak Detection Linux/targets/chromium.linux.json b/infra/config/generated/builders/ci/Leak Detection Linux/targets/chromium.linux.json index 9652652..daad51c 100644 --- a/infra/config/generated/builders/ci/Leak Detection Linux/targets/chromium.linux.json +++ b/infra/config/generated/builders/ci/Leak Detection Linux/targets/chromium.linux.json
@@ -17,6 +17,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "memory.leak_detection", "swarming": { "dimensions": {
diff --git "a/infra/config/generated/builders/ci/Linux Builder \050dbg\051/targets/chromium.linux.json" "b/infra/config/generated/builders/ci/Linux Builder \050dbg\051/targets/chromium.linux.json" index 3a6cd51..67fb36df 100644 --- "a/infra/config/generated/builders/ci/Linux Builder \050dbg\051/targets/chromium.linux.json" +++ "b/infra/config/generated/builders/ci/Linux Builder \050dbg\051/targets/chromium.linux.json"
@@ -1659,6 +1659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/Linux Builder/targets/chromium.linux.json b/infra/config/generated/builders/ci/Linux Builder/targets/chromium.linux.json index 5c52db2..8bf3c7b 100644 --- a/infra/config/generated/builders/ci/Linux Builder/targets/chromium.linux.json +++ b/infra/config/generated/builders/ci/Linux Builder/targets/chromium.linux.json
@@ -2205,6 +2205,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2278,6 +2279,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git "a/infra/config/generated/builders/ci/Linux Debug \050NVIDIA\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Linux Debug \050NVIDIA\051/targets/chromium.gpu.json" index 517a88e..04c151e 100644 --- "a/infra/config/generated/builders/ci/Linux Debug \050NVIDIA\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Linux Debug \050NVIDIA\051/targets/chromium.gpu.json"
@@ -103,6 +103,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -143,6 +144,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -184,6 +186,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -220,6 +223,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -260,6 +264,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -300,6 +305,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -342,6 +348,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -378,6 +385,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -415,6 +423,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" index 0f650c49..6e96a67 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -78,6 +78,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -118,6 +119,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -159,6 +161,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -195,6 +198,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -235,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -275,6 +280,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -317,6 +323,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -353,6 +360,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -390,6 +398,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050AMD 780M\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050AMD 780M\051/targets/chromium.gpu.fyi.json" index 863ac67..ff8735c 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050AMD 780M\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050AMD 780M\051/targets/chromium.gpu.fyi.json"
@@ -195,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -237,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -280,6 +282,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -318,6 +321,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -360,6 +364,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -402,6 +407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -484,6 +491,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -522,6 +530,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -562,6 +571,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -602,6 +612,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050AMD 890M\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050AMD 890M\051/targets/chromium.gpu.fyi.json" index 1995f22..c88eaa16 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050AMD 890M\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050AMD 890M\051/targets/chromium.gpu.fyi.json"
@@ -195,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -237,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -280,6 +282,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -318,6 +321,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -360,6 +364,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -402,6 +407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -484,6 +491,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -522,6 +530,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -562,6 +571,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -602,6 +612,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050Intel Arc 140V\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050Intel Arc 140V\051/targets/chromium.gpu.fyi.json" index c60fbff..a6bfc63 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050Intel Arc 140V\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050Intel Arc 140V\051/targets/chromium.gpu.fyi.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050Intel UHD 630\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050Intel UHD 630\051/targets/chromium.gpu.fyi.json" index 0b38697..ab54347 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050Intel UHD 630\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050Intel UHD 630\051/targets/chromium.gpu.fyi.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" index 0205039..9db22d6 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Experimental Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Experimental Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -230,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -309,6 +312,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -350,6 +354,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -391,6 +396,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -434,6 +440,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -471,6 +478,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -512,6 +520,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "vulkan_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -554,6 +563,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -593,6 +603,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -632,6 +643,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Release \050AMD RX 5500 XT\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Release \050AMD RX 5500 XT\051/targets/chromium.gpu.fyi.json" index faadbfb..27eb21d 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Release \050AMD RX 5500 XT\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Release \050AMD RX 5500 XT\051/targets/chromium.gpu.fyi.json"
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -230,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -309,6 +312,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -350,6 +354,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -391,6 +396,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -434,6 +440,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -471,6 +478,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -508,6 +516,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -547,6 +556,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -586,6 +596,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Release \050AMD RX 7600\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Release \050AMD RX 7600\051/targets/chromium.gpu.fyi.json" index e0969a7..8dbb81c 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Release \050AMD RX 7600\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Release \050AMD RX 7600\051/targets/chromium.gpu.fyi.json"
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -230,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -309,6 +312,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -350,6 +354,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -391,6 +396,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -434,6 +440,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -471,6 +478,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -508,6 +516,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -547,6 +556,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -586,6 +596,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Release \050Intel UHD 630\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Release \050Intel UHD 630\051/targets/chromium.gpu.fyi.json" index 53c1eaa8..784540d 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Release \050Intel UHD 630\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Release \050Intel UHD 630\051/targets/chromium.gpu.fyi.json"
@@ -155,6 +155,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -195,6 +196,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -236,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -272,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -312,6 +316,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -352,6 +357,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -394,6 +400,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -430,6 +437,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -466,6 +474,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -504,6 +513,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -542,6 +552,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Release \050Intel UHD 770\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Release \050Intel UHD 770\051/targets/chromium.gpu.fyi.json" index f59b957..7fceab7 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Release \050Intel UHD 770\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Release \050Intel UHD 770\051/targets/chromium.gpu.fyi.json"
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -231,6 +232,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -273,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -310,6 +313,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -351,6 +355,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -392,6 +397,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -435,6 +441,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -472,6 +479,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -509,6 +517,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -548,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -587,6 +597,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux FYI Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux FYI Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" index 9d7583b..e666394 100644 --- "a/infra/config/generated/builders/ci/Linux FYI Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux FYI Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -155,6 +155,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -195,6 +196,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -236,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -272,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -312,6 +316,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -352,6 +357,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -394,6 +400,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -430,6 +437,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -470,6 +478,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "vulkan_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -511,6 +520,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -549,6 +559,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -587,6 +598,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux Release \050NVIDIA\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Linux Release \050NVIDIA\051/targets/chromium.gpu.json" index 6b76275..44871b4f 100644 --- "a/infra/config/generated/builders/ci/Linux Release \050NVIDIA\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Linux Release \050NVIDIA\051/targets/chromium.gpu.json"
@@ -103,6 +103,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -143,6 +144,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -184,6 +186,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -220,6 +223,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -260,6 +264,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -300,6 +305,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -342,6 +348,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -378,6 +385,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -415,6 +423,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Linux Tests \050dbg\051\0501\051/targets/chromium.linux.json" "b/infra/config/generated/builders/ci/Linux Tests \050dbg\051\0501\051/targets/chromium.linux.json" index 0e0aa1f..d7ad34fd 100644 --- "a/infra/config/generated/builders/ci/Linux Tests \050dbg\051\0501\051/targets/chromium.linux.json" +++ "b/infra/config/generated/builders/ci/Linux Tests \050dbg\051\0501\051/targets/chromium.linux.json"
@@ -1654,6 +1654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/Linux Tests/targets/chromium.linux.json b/infra/config/generated/builders/ci/Linux Tests/targets/chromium.linux.json index af02064..59e655e 100644 --- a/infra/config/generated/builders/ci/Linux Tests/targets/chromium.linux.json +++ b/infra/config/generated/builders/ci/Linux Tests/targets/chromium.linux.json
@@ -2162,6 +2162,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2235,6 +2236,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git "a/infra/config/generated/builders/ci/Linux Wayland FYI Release \050AMD\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux Wayland FYI Release \050AMD\051/targets/chromium.gpu.fyi.json" index 8e0d0c13..9d0c432 100644 --- "a/infra/config/generated/builders/ci/Linux Wayland FYI Release \050AMD\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux Wayland FYI Release \050AMD\051/targets/chromium.gpu.fyi.json"
@@ -55,6 +55,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/Linux Wayland FYI Release \050Intel\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Linux Wayland FYI Release \050Intel\051/targets/chromium.gpu.fyi.json" index 942a9b251..a8d6a076 100644 --- "a/infra/config/generated/builders/ci/Linux Wayland FYI Release \050Intel\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Linux Wayland FYI Release \050Intel\051/targets/chromium.gpu.fyi.json"
@@ -54,6 +54,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -98,6 +99,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -143,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -183,6 +186,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -227,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -271,6 +276,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -317,6 +323,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -357,6 +364,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -397,6 +405,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -438,6 +447,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -479,6 +489,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac Builder \050dbg\051/targets/chromium.mac.json" "b/infra/config/generated/builders/ci/Mac Builder \050dbg\051/targets/chromium.mac.json" index 78fc2bb..deb28f70 100644 --- "a/infra/config/generated/builders/ci/Mac Builder \050dbg\051/targets/chromium.mac.json" +++ "b/infra/config/generated/builders/ci/Mac Builder \050dbg\051/targets/chromium.mac.json"
@@ -1573,6 +1573,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -1594,6 +1595,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/Mac Builder Next/targets/chromium.fyi.json b/infra/config/generated/builders/ci/Mac Builder Next/targets/chromium.fyi.json index b6ec8cc3..5efef76 100644 --- a/infra/config/generated/builders/ci/Mac Builder Next/targets/chromium.fyi.json +++ b/infra/config/generated/builders/ci/Mac Builder Next/targets/chromium.fyi.json
@@ -1559,6 +1559,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/Mac Builder/targets/chromium.mac.json b/infra/config/generated/builders/ci/Mac Builder/targets/chromium.mac.json index 2c2724b6..dd3d46b 100644 --- a/infra/config/generated/builders/ci/Mac Builder/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/Mac Builder/targets/chromium.mac.json
@@ -1827,6 +1827,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -3721,6 +3722,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -3796,6 +3798,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true @@ -5696,6 +5699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -7612,6 +7616,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git "a/infra/config/generated/builders/ci/Mac Debug \050Intel\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Mac Debug \050Intel\051/targets/chromium.gpu.json" index 0f0341aac..136799e 100644 --- "a/infra/config/generated/builders/ci/Mac Debug \050Intel\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Mac Debug \050Intel\051/targets/chromium.gpu.json"
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -146,6 +147,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -189,6 +191,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -227,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -269,6 +273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -311,6 +316,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -355,6 +361,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -393,6 +400,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -433,6 +441,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI ASAN \050Intel\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI ASAN \050Intel\051/targets/chromium.gpu.fyi.json" index c05eda6..2b15c8f 100644 --- "a/infra/config/generated/builders/ci/Mac FYI ASAN \050Intel\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI ASAN \050Intel\051/targets/chromium.gpu.fyi.json"
@@ -177,6 +177,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -214,6 +215,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -251,6 +253,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -292,6 +295,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -338,6 +342,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -384,6 +389,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -426,6 +432,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -463,6 +470,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -504,6 +512,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -545,6 +554,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -592,6 +602,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -639,6 +650,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -683,6 +695,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -721,6 +734,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -759,6 +773,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -796,6 +811,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -834,6 +850,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -871,6 +888,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -908,6 +926,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -947,6 +966,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -986,6 +1006,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1025,6 +1046,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1062,6 +1084,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1099,6 +1122,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1136,6 +1160,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Debug \050Intel\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Debug \050Intel\051/targets/chromium.gpu.fyi.json" index 42c0bd3..f909c2d 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Debug \050Intel\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Debug \050Intel\051/targets/chromium.gpu.fyi.json"
@@ -149,6 +149,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -190,6 +191,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -232,6 +234,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -269,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -310,6 +314,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -351,6 +356,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -395,6 +401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -432,6 +439,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -470,6 +478,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Experimental Release \050Apple M1\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Experimental Release \050Apple M1\051/targets/chromium.gpu.fyi.json" index 011d671..5eadcaa 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Experimental Release \050Apple M1\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Experimental Release \050Apple M1\051/targets/chromium.gpu.fyi.json"
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -232,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -276,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -315,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -358,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -401,6 +406,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -524,6 +532,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -566,6 +575,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -608,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -648,6 +659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -687,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Experimental Release \050Intel\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Experimental Release \050Intel\051/targets/chromium.gpu.fyi.json" index a0a69b1..b92fcfcb 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Experimental Release \050Intel\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Experimental Release \050Intel\051/targets/chromium.gpu.fyi.json"
@@ -183,6 +183,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -221,6 +222,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -259,6 +261,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -301,6 +304,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -348,6 +352,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -395,6 +400,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -438,6 +444,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -476,6 +483,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -518,6 +526,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -560,6 +569,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -607,6 +617,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -654,6 +665,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -698,6 +710,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -737,6 +750,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -776,6 +790,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -814,6 +829,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -852,6 +868,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -890,6 +907,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -928,6 +946,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -968,6 +987,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1010,6 +1030,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1050,6 +1071,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1091,6 +1113,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1131,6 +1154,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1170,6 +1194,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1208,6 +1233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1246,6 +1272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1284,6 +1311,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Experimental Retina Release \050AMD\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Experimental Retina Release \050AMD\051/targets/chromium.gpu.fyi.json" index bbfaf2a..0712f7b 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Experimental Retina Release \050AMD\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Experimental Retina Release \050AMD\051/targets/chromium.gpu.fyi.json"
@@ -195,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -235,6 +236,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -275,6 +277,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -319,6 +322,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -417,6 +422,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -462,6 +468,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -502,6 +509,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -546,6 +554,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -590,6 +599,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -639,6 +649,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -688,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -734,6 +746,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -775,6 +788,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -816,6 +830,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -856,6 +871,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -896,6 +912,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -936,6 +953,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -976,6 +994,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1018,6 +1037,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1062,6 +1082,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1104,6 +1125,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1147,6 +1169,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1189,6 +1212,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1230,6 +1254,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1270,6 +1295,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1310,6 +1336,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1350,6 +1377,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Experimental Retina Release \050Apple M2\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Experimental Retina Release \050Apple M2\051/targets/chromium.gpu.fyi.json" index 422170a..f711e6c 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Experimental Retina Release \050Apple M2\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Experimental Retina Release \050Apple M2\051/targets/chromium.gpu.fyi.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/Mac FYI Release \050Apple M1\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Release \050Apple M1\051/targets/chromium.gpu.fyi.json" index 49254676..e73e486 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Release \050Apple M1\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Release \050Apple M1\051/targets/chromium.gpu.fyi.json"
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -232,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -276,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -315,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -358,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -401,6 +406,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -524,6 +532,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -566,6 +575,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -608,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -648,6 +659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -687,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Release \050Intel\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Release \050Intel\051/targets/chromium.gpu.fyi.json" index a69f0b5..50e2201 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Release \050Intel\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Release \050Intel\051/targets/chromium.gpu.fyi.json"
@@ -177,6 +177,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -214,6 +215,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -255,6 +257,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -301,6 +304,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +347,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -380,6 +385,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -421,6 +427,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -467,6 +474,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -510,6 +518,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -548,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -585,6 +595,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -622,6 +633,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -659,6 +671,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -698,6 +711,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -739,6 +753,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -778,6 +793,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -818,6 +834,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -856,6 +873,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -893,6 +911,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -930,6 +949,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -967,6 +987,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Retina ASAN \050AMD\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Retina ASAN \050AMD\051/targets/chromium.gpu.fyi.json" index 197e248..e66b52a 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Retina ASAN \050AMD\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Retina ASAN \050AMD\051/targets/chromium.gpu.fyi.json"
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -232,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -280,6 +282,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -325,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -364,6 +368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -405,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -487,6 +494,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -526,6 +534,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -565,6 +574,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -604,6 +614,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Retina Debug \050AMD\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Retina Debug \050AMD\051/targets/chromium.gpu.fyi.json" index c763fad..4e864d0 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Retina Debug \050AMD\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Retina Debug \050AMD\051/targets/chromium.gpu.fyi.json"
@@ -159,6 +159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -202,6 +203,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -246,6 +248,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -285,6 +288,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -328,6 +332,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -371,6 +376,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -417,6 +423,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -456,6 +463,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -496,6 +504,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Retina Release \050AMD\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Retina Release \050AMD\051/targets/chromium.gpu.fyi.json" index 8dae2b96..e05b7780 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Retina Release \050AMD\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Retina Release \050AMD\051/targets/chromium.gpu.fyi.json"
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -228,6 +229,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -271,6 +273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -319,6 +322,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -363,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -402,6 +407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -445,6 +451,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -493,6 +500,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -538,6 +546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -578,6 +587,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -617,6 +627,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -656,6 +667,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -695,6 +707,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -736,6 +749,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -779,6 +793,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -820,6 +835,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -862,6 +878,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -902,6 +919,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -941,6 +959,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -980,6 +999,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1019,6 +1039,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Retina Release \050Apple M2\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Retina Release \050Apple M2\051/targets/chromium.gpu.fyi.json" index 932ae5e..09bc11bb 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Retina Release \050Apple M2\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Retina Release \050Apple M2\051/targets/chromium.gpu.fyi.json"
@@ -195,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -239,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -284,6 +286,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -412,6 +417,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -458,6 +464,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -498,6 +505,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -538,6 +546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -581,6 +590,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -624,6 +634,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -665,6 +676,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -705,6 +717,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac FYI Retina Release \050Apple M3\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac FYI Retina Release \050Apple M3\051/targets/chromium.gpu.fyi.json" index 2c03a225..ebe2160f 100644 --- "a/infra/config/generated/builders/ci/Mac FYI Retina Release \050Apple M3\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac FYI Retina Release \050Apple M3\051/targets/chromium.gpu.fyi.json"
@@ -195,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -239,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -284,6 +286,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -412,6 +417,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -458,6 +464,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -498,6 +505,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -538,6 +546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -581,6 +590,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -624,6 +634,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -665,6 +676,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -705,6 +717,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac Pro FYI Release \050AMD\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Mac Pro FYI Release \050AMD\051/targets/chromium.gpu.fyi.json" index 90e51868..337379cd 100644 --- "a/infra/config/generated/builders/ci/Mac Pro FYI Release \050AMD\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Mac Pro FYI Release \050AMD\051/targets/chromium.gpu.fyi.json"
@@ -156,6 +156,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -198,6 +199,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -241,6 +243,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -279,6 +282,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -321,6 +325,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -363,6 +368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -407,6 +413,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -445,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -485,6 +493,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -525,6 +534,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac Release \050Intel\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Mac Release \050Intel\051/targets/chromium.gpu.json" index 64ea39e..f25e534 100644 --- "a/infra/config/generated/builders/ci/Mac Release \050Intel\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Mac Release \050Intel\051/targets/chromium.gpu.json"
@@ -133,6 +133,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -175,6 +176,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -218,6 +220,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -256,6 +259,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -298,6 +302,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -340,6 +345,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -384,6 +390,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -422,6 +429,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -462,6 +470,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac Retina Debug \050AMD\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Mac Retina Debug \050AMD\051/targets/chromium.gpu.json" index 457c6ae..aed14cd 100644 --- "a/infra/config/generated/builders/ci/Mac Retina Debug \050AMD\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Mac Retina Debug \050AMD\051/targets/chromium.gpu.json"
@@ -110,6 +110,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -154,6 +155,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -199,6 +201,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -239,6 +242,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -283,6 +287,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -327,6 +332,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -374,6 +380,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -414,6 +421,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -456,6 +464,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Mac Retina Release \050AMD\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Mac Retina Release \050AMD\051/targets/chromium.gpu.json" index 8de82f8..4e31c6d 100644 --- "a/infra/config/generated/builders/ci/Mac Retina Release \050AMD\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Mac Retina Release \050AMD\051/targets/chromium.gpu.json"
@@ -141,6 +141,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -185,6 +186,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -230,6 +232,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -270,6 +273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -314,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -358,6 +363,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -404,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -444,6 +451,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -486,6 +494,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Mac12 Tests/targets/chromium.mac.json b/infra/config/generated/builders/ci/Mac12 Tests/targets/chromium.mac.json index 73616443..3e2d8ce 100644 --- a/infra/config/generated/builders/ci/Mac12 Tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/Mac12 Tests/targets/chromium.mac.json
@@ -1799,6 +1799,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/Mac13 Tests/targets/chromium.mac.json b/infra/config/generated/builders/ci/Mac13 Tests/targets/chromium.mac.json index 957bf9f7..b1d67dc 100644 --- a/infra/config/generated/builders/ci/Mac13 Tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/Mac13 Tests/targets/chromium.mac.json
@@ -1798,6 +1798,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1873,6 +1874,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git "a/infra/config/generated/builders/ci/Win x64 Builder \050dbg\051/targets/chromium.win.json" "b/infra/config/generated/builders/ci/Win x64 Builder \050dbg\051/targets/chromium.win.json" index 39ec2c46..eb255b3 100644 --- "a/infra/config/generated/builders/ci/Win x64 Builder \050dbg\051/targets/chromium.win.json" +++ "b/infra/config/generated/builders/ci/Win x64 Builder \050dbg\051/targets/chromium.win.json"
@@ -1779,6 +1779,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -1800,6 +1801,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/Win x64 Builder/targets/chromium.win.json b/infra/config/generated/builders/ci/Win x64 Builder/targets/chromium.win.json index 2a14f8e..782730c 100644 --- a/infra/config/generated/builders/ci/Win x64 Builder/targets/chromium.win.json +++ b/infra/config/generated/builders/ci/Win x64 Builder/targets/chromium.win.json
@@ -2346,6 +2346,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2367,6 +2368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true @@ -4589,6 +4591,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 DX12 Vulkan Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 DX12 Vulkan Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" index 7b265f3..0dd1d2f4 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 DX12 Vulkan Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 DX12 Vulkan Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 DX12 Vulkan Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 DX12 Vulkan Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" index 533b681..a63b8ede 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 DX12 Vulkan Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 DX12 Vulkan Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" index db81af87..f5a9c54 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -174,6 +174,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -215,6 +216,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -257,6 +259,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -294,6 +297,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -335,6 +339,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -376,6 +381,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -419,6 +425,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -456,6 +463,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -494,6 +502,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -533,6 +542,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Exp Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Exp Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" index 2302a4a..ba20375 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 Exp Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Exp Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -237,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -275,6 +276,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -317,6 +319,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -364,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -407,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -445,6 +450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -487,6 +493,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -562,6 +569,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -609,6 +617,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -653,6 +662,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -692,6 +702,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -730,6 +741,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -768,6 +780,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -808,6 +821,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -848,6 +862,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -888,6 +903,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -928,6 +944,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -967,6 +984,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Experimental Release \050Intel\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Experimental Release \050Intel\051/targets/chromium.gpu.fyi.json" index 11d68ba..b3c8904ca 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 Experimental Release \050Intel\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Experimental Release \050Intel\051/targets/chromium.gpu.fyi.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050AMD RX 5500 XT\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050AMD RX 5500 XT\051/targets/chromium.gpu.fyi.json" index 0cf8cb0..7b95317 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050AMD RX 5500 XT\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050AMD RX 5500 XT\051/targets/chromium.gpu.fyi.json"
@@ -203,6 +203,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -244,6 +245,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -286,6 +288,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -323,6 +326,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -364,6 +368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -405,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -448,6 +454,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -522,6 +530,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -561,6 +570,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -600,6 +610,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -639,6 +650,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -677,6 +689,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050Intel UHD 770\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050Intel UHD 770\051/targets/chromium.gpu.fyi.json" index add3e8f..a66cad6 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050Intel UHD 770\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050Intel UHD 770\051/targets/chromium.gpu.fyi.json"
@@ -230,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -271,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -313,6 +315,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -350,6 +353,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -391,6 +395,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -432,6 +437,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -475,6 +481,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -512,6 +519,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -549,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -588,6 +597,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -627,6 +637,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -666,6 +677,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -705,6 +717,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -743,6 +756,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050Intel\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050Intel\051/targets/chromium.gpu.fyi.json" index cb15671..c1b45a3 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050Intel\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050Intel\051/targets/chromium.gpu.fyi.json"
@@ -229,6 +229,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -270,6 +271,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -312,6 +314,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -349,6 +352,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -390,6 +394,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -431,6 +436,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -474,6 +480,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -511,6 +518,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -548,6 +556,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -587,6 +596,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -626,6 +636,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -665,6 +676,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -704,6 +716,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -742,6 +755,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" index 624cfc4..fd7319d 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -202,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -239,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -280,6 +282,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -326,6 +329,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -405,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -519,6 +526,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -565,6 +573,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -608,6 +617,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -646,6 +656,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -683,6 +694,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -720,6 +732,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -759,6 +772,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -798,6 +812,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -837,6 +852,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -875,6 +891,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x86 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x86 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" index d355516..34f246d 100644 --- "a/infra/config/generated/builders/ci/Win10 FYI x86 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win10 FYI x86 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -202,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -239,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -280,6 +282,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -326,6 +329,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -405,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -519,6 +526,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -565,6 +573,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -608,6 +617,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -646,6 +656,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -683,6 +694,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -720,6 +732,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -759,6 +772,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -798,6 +812,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -837,6 +852,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -875,6 +891,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win10 Tests x64 \050dbg\051/targets/chromium.win.json" "b/infra/config/generated/builders/ci/Win10 Tests x64 \050dbg\051/targets/chromium.win.json" index 54cb7806..fe9f974 100644 --- "a/infra/config/generated/builders/ci/Win10 Tests x64 \050dbg\051/targets/chromium.win.json" +++ "b/infra/config/generated/builders/ci/Win10 Tests x64 \050dbg\051/targets/chromium.win.json"
@@ -1774,6 +1774,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -1795,6 +1796,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/Win10 Tests x64/targets/chromium.win.json b/infra/config/generated/builders/ci/Win10 Tests x64/targets/chromium.win.json index 618ac79ea..4aae3ed 100644 --- a/infra/config/generated/builders/ci/Win10 Tests x64/targets/chromium.win.json +++ b/infra/config/generated/builders/ci/Win10 Tests x64/targets/chromium.win.json
@@ -2317,6 +2317,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2338,6 +2339,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git "a/infra/config/generated/builders/ci/Win10 x64 Debug \050NVIDIA\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Win10 x64 Debug \050NVIDIA\051/targets/chromium.gpu.json" index b620bec..2283da9 100644 --- "a/infra/config/generated/builders/ci/Win10 x64 Debug \050NVIDIA\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Win10 x64 Debug \050NVIDIA\051/targets/chromium.gpu.json"
@@ -159,6 +159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -201,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -244,6 +246,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -282,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -324,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -366,6 +371,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -410,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -448,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -487,6 +495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win10 x64 Release \050NVIDIA\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Win10 x64 Release \050NVIDIA\051/targets/chromium.gpu.json" index 19fe45b..6ca893a 100644 --- "a/infra/config/generated/builders/ci/Win10 x64 Release \050NVIDIA\051/targets/chromium.gpu.json" +++ "b/infra/config/generated/builders/ci/Win10 x64 Release \050NVIDIA\051/targets/chromium.gpu.json"
@@ -159,6 +159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -201,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -244,6 +246,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -282,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -324,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -366,6 +371,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -410,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -448,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -488,6 +496,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win11 FYI arm64 Release \050Qualcomm Adreno 690\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win11 FYI arm64 Release \050Qualcomm Adreno 690\051/targets/chromium.gpu.fyi.json" index c982854..5fa86a7 100644 --- "a/infra/config/generated/builders/ci/Win11 FYI arm64 Release \050Qualcomm Adreno 690\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win11 FYI arm64 Release \050Qualcomm Adreno 690\051/targets/chromium.gpu.fyi.json"
@@ -219,6 +219,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -262,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -306,6 +308,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -345,6 +348,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -388,6 +392,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -431,6 +436,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -476,6 +482,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -515,6 +522,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -554,6 +562,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -595,6 +604,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -636,6 +646,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -676,6 +687,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050AMD 780M\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050AMD 780M\051/targets/chromium.gpu.fyi.json" index 60f84ec..ee1acf8 100644 --- "a/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050AMD 780M\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050AMD 780M\051/targets/chromium.gpu.fyi.json"
@@ -237,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -279,6 +280,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -322,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -360,6 +363,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -402,6 +406,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -444,6 +449,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -488,6 +494,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -526,6 +533,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -564,6 +572,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -604,6 +613,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -644,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -684,6 +695,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -723,6 +735,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050AMD 890M\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050AMD 890M\051/targets/chromium.gpu.fyi.json" index 54425c27..d648718 100644 --- "a/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050AMD 890M\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050AMD 890M\051/targets/chromium.gpu.fyi.json"
@@ -237,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -279,6 +280,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -322,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -360,6 +363,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -402,6 +406,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -444,6 +449,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -488,6 +494,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -526,6 +533,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -564,6 +572,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -604,6 +613,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -644,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -684,6 +695,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -723,6 +735,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050Intel Arc 140V\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050Intel Arc 140V\051/targets/chromium.gpu.fyi.json" index 83bd4c9..0ed3dfa 100644 --- "a/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050Intel Arc 140V\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050Intel Arc 140V\051/targets/chromium.gpu.fyi.json"
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git "a/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050NVIDIA RTX 4070 Super\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050NVIDIA RTX 4070 Super\051/targets/chromium.gpu.fyi.json" index e92c7d2..d1af78f 100644 --- "a/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050NVIDIA RTX 4070 Super\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win11 FYI x64 Experimental Release \050NVIDIA RTX 4070 Super\051/targets/chromium.gpu.fyi.json"
@@ -236,6 +236,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -274,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -316,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -363,6 +366,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -406,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -444,6 +449,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -486,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -561,6 +568,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -608,6 +616,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -652,6 +661,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -691,6 +701,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -729,6 +740,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -767,6 +779,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -807,6 +820,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -847,6 +861,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -887,6 +902,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -927,6 +943,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -966,6 +983,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win11 FYI x64 Release \050AMD RX 7600\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win11 FYI x64 Release \050AMD RX 7600\051/targets/chromium.gpu.fyi.json" index adbe7f6..c0e6832 100644 --- "a/infra/config/generated/builders/ci/Win11 FYI x64 Release \050AMD RX 7600\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win11 FYI x64 Release \050AMD RX 7600\051/targets/chromium.gpu.fyi.json"
@@ -230,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -271,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -313,6 +315,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -350,6 +353,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -391,6 +395,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -432,6 +437,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -475,6 +481,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -512,6 +519,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -549,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -588,6 +597,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -627,6 +637,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -666,6 +677,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -704,6 +716,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git "a/infra/config/generated/builders/ci/Win11 FYI x64 Release \050NVIDIA RTX 4070 Super\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win11 FYI x64 Release \050NVIDIA RTX 4070 Super\051/targets/chromium.gpu.fyi.json" index 1b4e818..de820ce 100644 --- "a/infra/config/generated/builders/ci/Win11 FYI x64 Release \050NVIDIA RTX 4070 Super\051/targets/chromium.gpu.fyi.json" +++ "b/infra/config/generated/builders/ci/Win11 FYI x64 Release \050NVIDIA RTX 4070 Super\051/targets/chromium.gpu.fyi.json"
@@ -236,6 +236,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -274,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -316,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -363,6 +366,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -406,6 +410,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -444,6 +449,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -486,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -561,6 +568,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -608,6 +616,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -652,6 +661,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -691,6 +701,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -729,6 +740,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -767,6 +779,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -807,6 +820,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -847,6 +861,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -887,6 +902,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -927,6 +943,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -966,6 +983,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/Win11 Tests x64/targets/chromium.win.json b/infra/config/generated/builders/ci/Win11 Tests x64/targets/chromium.win.json index 271a8f7..df767b6 100644 --- a/infra/config/generated/builders/ci/Win11 Tests x64/targets/chromium.win.json +++ b/infra/config/generated/builders/ci/Win11 Tests x64/targets/chromium.win.json
@@ -2142,6 +2142,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/android-12-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/ci/android-12-x64-rel/targets/chromium.android.json index c464b7e..d0bb3452 100644 --- a/infra/config/generated/builders/ci/android-12-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/ci/android-12-x64-rel/targets/chromium.android.json
@@ -3910,6 +3910,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/android-13-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/ci/android-13-x64-rel/targets/chromium.android.json index d019fcc..1307cf6 100644 --- a/infra/config/generated/builders/ci/android-13-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/ci/android-13-x64-rel/targets/chromium.android.json
@@ -3745,6 +3745,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/android-15-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/ci/android-15-x64-rel/targets/chromium.android.json index 7b8a1576..2845c94 100644 --- a/infra/config/generated/builders/ci/android-15-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/ci/android-15-x64-rel/targets/chromium.android.json
@@ -3951,6 +3951,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/android-16-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/ci/android-16-x64-rel/targets/chromium.android.json index f5b1632a..d46bc773 100644 --- a/infra/config/generated/builders/ci/android-16-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/ci/android-16-x64-rel/targets/chromium.android.json
@@ -3770,6 +3770,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/android-angle-chromium-arm64-builder/targets/chromium.angle.json b/infra/config/generated/builders/ci/android-angle-chromium-arm64-builder/targets/chromium.angle.json index 4275415..2b50c14 100644 --- a/infra/config/generated/builders/ci/android-angle-chromium-arm64-builder/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/android-angle-chromium-arm64-builder/targets/chromium.angle.json
@@ -20,6 +20,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/android-angle-chromium-arm64-pixel2/targets/chromium.angle.json b/infra/config/generated/builders/ci/android-angle-chromium-arm64-pixel2/targets/chromium.angle.json index ac2c3106..986be27 100644 --- a/infra/config/generated/builders/ci/android-angle-chromium-arm64-pixel2/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/android-angle-chromium-arm64-pixel2/targets/chromium.angle.json
@@ -19,6 +19,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/android-structured-test-ids-16-x64-rel-fyi/targets/chromium.android.fyi.json b/infra/config/generated/builders/ci/android-structured-test-ids-16-x64-rel-fyi/targets/chromium.android.fyi.json index e0be696..ead516c2 100644 --- a/infra/config/generated/builders/ci/android-structured-test-ids-16-x64-rel-fyi/targets/chromium.android.fyi.json +++ b/infra/config/generated/builders/ci/android-structured-test-ids-16-x64-rel-fyi/targets/chromium.android.fyi.json
@@ -4170,6 +4170,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/chromeos-amd64-generic-rel-gtest/targets/chromium.chromiumos.json b/infra/config/generated/builders/ci/chromeos-amd64-generic-rel-gtest/targets/chromium.chromiumos.json index 98b9d04..d5c7ee5 100644 --- a/infra/config/generated/builders/ci/chromeos-amd64-generic-rel-gtest/targets/chromium.chromiumos.json +++ b/infra/config/generated/builders/ci/chromeos-amd64-generic-rel-gtest/targets/chromium.chromiumos.json
@@ -1073,6 +1073,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/chromeos-amd64-generic-rel/targets/chromium.chromiumos.json b/infra/config/generated/builders/ci/chromeos-amd64-generic-rel/targets/chromium.chromiumos.json index 13829fc7..ee97336 100644 --- a/infra/config/generated/builders/ci/chromeos-amd64-generic-rel/targets/chromium.chromiumos.json +++ b/infra/config/generated/builders/ci/chromeos-amd64-generic-rel/targets/chromium.chromiumos.json
@@ -1078,6 +1078,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/chromeos-structured-test-ids-amd64-generic-rel-fyi/targets/chromium.fyi.json b/infra/config/generated/builders/ci/chromeos-structured-test-ids-amd64-generic-rel-fyi/targets/chromium.fyi.json index b5ed6f9..926dc07 100644 --- a/infra/config/generated/builders/ci/chromeos-structured-test-ids-amd64-generic-rel-fyi/targets/chromium.fyi.json +++ b/infra/config/generated/builders/ci/chromeos-structured-test-ids-amd64-generic-rel-fyi/targets/chromium.fyi.json
@@ -1241,6 +1241,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/fuchsia-fyi-x64-asan/targets/chromium.fuchsia.fyi.json b/infra/config/generated/builders/ci/fuchsia-fyi-x64-asan/targets/chromium.fuchsia.fyi.json index 9e7f1df..30fe9c1 100644 --- a/infra/config/generated/builders/ci/fuchsia-fyi-x64-asan/targets/chromium.fuchsia.fyi.json +++ b/infra/config/generated/builders/ci/fuchsia-fyi-x64-asan/targets/chromium.fuchsia.fyi.json
@@ -1557,6 +1557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1593,6 +1594,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1630,6 +1632,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1662,6 +1665,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1698,6 +1702,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1736,6 +1741,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/fuchsia-netstack2-x64-cast-receiver-rel/targets/chromium.fuchsia.fyi.json b/infra/config/generated/builders/ci/fuchsia-netstack2-x64-cast-receiver-rel/targets/chromium.fuchsia.fyi.json index c5293bfa..07c1a48 100644 --- a/infra/config/generated/builders/ci/fuchsia-netstack2-x64-cast-receiver-rel/targets/chromium.fuchsia.fyi.json +++ b/infra/config/generated/builders/ci/fuchsia-netstack2-x64-cast-receiver-rel/targets/chromium.fuchsia.fyi.json
@@ -1904,6 +1904,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1943,6 +1944,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1983,6 +1985,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2018,6 +2021,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2057,6 +2061,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2098,6 +2103,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-dbg/targets/chromium.fuchsia.json b/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-dbg/targets/chromium.fuchsia.json index 2f07300..ba9ac36db5 100644 --- a/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-dbg/targets/chromium.fuchsia.json +++ b/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-dbg/targets/chromium.fuchsia.json
@@ -1643,6 +1643,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1680,6 +1681,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1718,6 +1720,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1751,6 +1754,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1788,6 +1792,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1827,6 +1832,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-rel/targets/chromium.fuchsia.json b/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-rel/targets/chromium.fuchsia.json index 7dc16e7..e8936a3 100644 --- a/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-rel/targets/chromium.fuchsia.json +++ b/infra/config/generated/builders/ci/fuchsia-x64-cast-receiver-rel/targets/chromium.fuchsia.json
@@ -1836,6 +1836,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1874,6 +1875,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1913,6 +1915,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1947,6 +1950,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1985,6 +1989,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2025,6 +2030,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/fuchsia-x64-perf-cast-receiver-rel/targets/chromium.fuchsia.fyi.json b/infra/config/generated/builders/ci/fuchsia-x64-perf-cast-receiver-rel/targets/chromium.fuchsia.fyi.json index 94887c0..4ddbc74 100644 --- a/infra/config/generated/builders/ci/fuchsia-x64-perf-cast-receiver-rel/targets/chromium.fuchsia.fyi.json +++ b/infra/config/generated/builders/ci/fuchsia-x64-perf-cast-receiver-rel/targets/chromium.fuchsia.fyi.json
@@ -1833,6 +1833,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1871,6 +1872,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1910,6 +1912,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1944,6 +1947,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1982,6 +1986,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2022,6 +2027,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/linux-angle-chromium-builder/targets/chromium.angle.json b/infra/config/generated/builders/ci/linux-angle-chromium-builder/targets/chromium.angle.json index 35b86eae..3c3dd15 100644 --- a/infra/config/generated/builders/ci/linux-angle-chromium-builder/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/linux-angle-chromium-builder/targets/chromium.angle.json
@@ -79,6 +79,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -113,6 +114,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -149,6 +151,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -185,6 +188,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -285,6 +289,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -319,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -355,6 +361,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -391,6 +398,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/linux-angle-chromium-intel/targets/chromium.angle.json b/infra/config/generated/builders/ci/linux-angle-chromium-intel/targets/chromium.angle.json index 8b211f0..d6a32a7 100644 --- a/infra/config/generated/builders/ci/linux-angle-chromium-intel/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/linux-angle-chromium-intel/targets/chromium.angle.json
@@ -78,6 +78,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -112,6 +113,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -148,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -184,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/linux-angle-chromium-nvidia/targets/chromium.angle.json b/infra/config/generated/builders/ci/linux-angle-chromium-nvidia/targets/chromium.angle.json index 842eff1..1d79ab4 100644 --- a/infra/config/generated/builders/ci/linux-angle-chromium-nvidia/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/linux-angle-chromium-nvidia/targets/chromium.angle.json
@@ -78,6 +78,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -112,6 +113,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -148,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -184,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/linux-code-coverage/targets/chromium.coverage.json b/infra/config/generated/builders/ci/linux-code-coverage/targets/chromium.coverage.json index 2e59406..48d2982 100644 --- a/infra/config/generated/builders/ci/linux-code-coverage/targets/chromium.coverage.json +++ b/infra/config/generated/builders/ci/linux-code-coverage/targets/chromium.coverage.json
@@ -2002,6 +2002,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2201,6 +2202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -2236,6 +2238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/linux-rel-cft/targets/chromium.cft.json b/infra/config/generated/builders/ci/linux-rel-cft/targets/chromium.cft.json index f964ba6..218b16d1 100644 --- a/infra/config/generated/builders/ci/linux-rel-cft/targets/chromium.cft.json +++ b/infra/config/generated/builders/ci/linux-rel-cft/targets/chromium.cft.json
@@ -2019,6 +2019,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/linux-rel-no-external-ip/targets/chromium.fyi.json b/infra/config/generated/builders/ci/linux-rel-no-external-ip/targets/chromium.fyi.json index 1bbabcc..f9c742f00 100644 --- a/infra/config/generated/builders/ci/linux-rel-no-external-ip/targets/chromium.fyi.json +++ b/infra/config/generated/builders/ci/linux-rel-no-external-ip/targets/chromium.fyi.json
@@ -2249,6 +2249,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/linux-structured-test-ids-rel-fyi/targets/chromium.fyi.json b/infra/config/generated/builders/ci/linux-structured-test-ids-rel-fyi/targets/chromium.fyi.json index 886ea50f..e5a60d4 100644 --- a/infra/config/generated/builders/ci/linux-structured-test-ids-rel-fyi/targets/chromium.fyi.json +++ b/infra/config/generated/builders/ci/linux-structured-test-ids-rel-fyi/targets/chromium.fyi.json
@@ -2162,6 +2162,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2235,6 +2236,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/linux-swangle-chromium-x64/targets/chromium.swangle.json b/infra/config/generated/builders/ci/linux-swangle-chromium-x64/targets/chromium.swangle.json index fd9d1c9..147fe3d2 100644 --- a/infra/config/generated/builders/ci/linux-swangle-chromium-x64/targets/chromium.swangle.json +++ b/infra/config/generated/builders/ci/linux-swangle-chromium-x64/targets/chromium.swangle.json
@@ -19,6 +19,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/linux-win-cross-rel/targets/chromium.win.json b/infra/config/generated/builders/ci/linux-win-cross-rel/targets/chromium.win.json index 778cf17..669e7c5 100644 --- a/infra/config/generated/builders/ci/linux-win-cross-rel/targets/chromium.win.json +++ b/infra/config/generated/builders/ci/linux-win-cross-rel/targets/chromium.win.json
@@ -2083,6 +2083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac-angle-chromium-amd/targets/chromium.angle.json b/infra/config/generated/builders/ci/mac-angle-chromium-amd/targets/chromium.angle.json index eb85ad4..b52058e5 100644 --- a/infra/config/generated/builders/ci/mac-angle-chromium-amd/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/mac-angle-chromium-amd/targets/chromium.angle.json
@@ -82,6 +82,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -121,6 +122,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -162,6 +164,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -201,6 +204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -241,6 +245,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -280,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -318,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/mac-angle-chromium-builder/targets/chromium.angle.json b/infra/config/generated/builders/ci/mac-angle-chromium-builder/targets/chromium.angle.json index 9e47db1..aac502f 100644 --- a/infra/config/generated/builders/ci/mac-angle-chromium-builder/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/mac-angle-chromium-builder/targets/chromium.angle.json
@@ -82,6 +82,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -121,6 +122,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -162,6 +164,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -201,6 +204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -241,6 +245,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -280,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -318,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -421,6 +428,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -458,6 +466,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -497,6 +506,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -534,6 +544,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -572,6 +583,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -609,6 +621,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -645,6 +658,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/mac-angle-chromium-intel/targets/chromium.angle.json b/infra/config/generated/builders/ci/mac-angle-chromium-intel/targets/chromium.angle.json index 1c1b943..b154895 100644 --- a/infra/config/generated/builders/ci/mac-angle-chromium-intel/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/mac-angle-chromium-intel/targets/chromium.angle.json
@@ -78,6 +78,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -115,6 +116,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -154,6 +156,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -191,6 +194,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -229,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -266,6 +271,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -302,6 +308,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/mac-arm64-rel/targets/chromium.mac.json b/infra/config/generated/builders/ci/mac-arm64-rel/targets/chromium.mac.json index 6ea2ac0..4aa0c31 100644 --- a/infra/config/generated/builders/ci/mac-arm64-rel/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/mac-arm64-rel/targets/chromium.mac.json
@@ -1770,6 +1770,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -3586,6 +3587,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -5460,6 +5462,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -7634,6 +7637,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac-osxbeta-rel/targets/chromium.fyi.json b/infra/config/generated/builders/ci/mac-osxbeta-rel/targets/chromium.fyi.json index 8cab1ef..f0d6011 100644 --- a/infra/config/generated/builders/ci/mac-osxbeta-rel/targets/chromium.fyi.json +++ b/infra/config/generated/builders/ci/mac-osxbeta-rel/targets/chromium.fyi.json
@@ -1646,6 +1646,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac-rel-cft/targets/chromium.cft.json b/infra/config/generated/builders/ci/mac-rel-cft/targets/chromium.cft.json index c9c224f..c0aa48e 100644 --- a/infra/config/generated/builders/ci/mac-rel-cft/targets/chromium.cft.json +++ b/infra/config/generated/builders/ci/mac-rel-cft/targets/chromium.cft.json
@@ -1753,6 +1753,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac-swangle-chromium-x64/targets/chromium.swangle.json b/infra/config/generated/builders/ci/mac-swangle-chromium-x64/targets/chromium.swangle.json index 9e7583db..7744214 100644 --- a/infra/config/generated/builders/ci/mac-swangle-chromium-x64/targets/chromium.swangle.json +++ b/infra/config/generated/builders/ci/mac-swangle-chromium-x64/targets/chromium.swangle.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/mac12-arm64-rel-tests/targets/chromium.mac.json b/infra/config/generated/builders/ci/mac12-arm64-rel-tests/targets/chromium.mac.json index 836cd0e9..fa9b0f0 100644 --- a/infra/config/generated/builders/ci/mac12-arm64-rel-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/mac12-arm64-rel-tests/targets/chromium.mac.json
@@ -1662,6 +1662,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac13-arm64-rel-tests/targets/chromium.mac.json b/infra/config/generated/builders/ci/mac13-arm64-rel-tests/targets/chromium.mac.json index ead2ba26..f78be25f 100644 --- a/infra/config/generated/builders/ci/mac13-arm64-rel-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/mac13-arm64-rel-tests/targets/chromium.mac.json
@@ -1750,6 +1750,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac14-arm64-rel-tests/targets/chromium.mac.json b/infra/config/generated/builders/ci/mac14-arm64-rel-tests/targets/chromium.mac.json index 0afbf935..ae7a3981 100644 --- a/infra/config/generated/builders/ci/mac14-arm64-rel-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/mac14-arm64-rel-tests/targets/chromium.mac.json
@@ -1806,6 +1806,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac14-tests/targets/chromium.mac.json b/infra/config/generated/builders/ci/mac14-tests/targets/chromium.mac.json index 21d66255..b9c416b 100644 --- a/infra/config/generated/builders/ci/mac14-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/mac14-tests/targets/chromium.mac.json
@@ -1820,6 +1820,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac15-arm64-rel-tests/targets/chromium.mac.json b/infra/config/generated/builders/ci/mac15-arm64-rel-tests/targets/chromium.mac.json index 40d5575..eb8c411e 100644 --- a/infra/config/generated/builders/ci/mac15-arm64-rel-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/mac15-arm64-rel-tests/targets/chromium.mac.json
@@ -2106,6 +2106,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac15-tests-dbg/targets/chromium.mac.json b/infra/config/generated/builders/ci/mac15-tests-dbg/targets/chromium.mac.json index 727067ac..5f62401 100644 --- a/infra/config/generated/builders/ci/mac15-tests-dbg/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/mac15-tests-dbg/targets/chromium.mac.json
@@ -1568,6 +1568,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -1589,6 +1590,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/mac15-x64-rel-tests/targets/chromium.mac.json b/infra/config/generated/builders/ci/mac15-x64-rel-tests/targets/chromium.mac.json index 7460c1b..6264c7b 100644 --- a/infra/config/generated/builders/ci/mac15-x64-rel-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/ci/mac15-x64-rel-tests/targets/chromium.mac.json
@@ -1820,6 +1820,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/win-angle-chromium-x64-builder/targets/chromium.angle.json b/infra/config/generated/builders/ci/win-angle-chromium-x64-builder/targets/chromium.angle.json index f26a9f65..ee80fadc 100644 --- a/infra/config/generated/builders/ci/win-angle-chromium-x64-builder/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/win-angle-chromium-x64-builder/targets/chromium.angle.json
@@ -22,6 +22,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -59,6 +60,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -96,6 +98,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -133,6 +136,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -170,6 +174,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -214,6 +219,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -251,6 +257,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -288,6 +295,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -325,6 +333,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/win-arm64-dbg/targets/chromium.win.json b/infra/config/generated/builders/ci/win-arm64-dbg/targets/chromium.win.json index 34d9046..5517c582 100644 --- a/infra/config/generated/builders/ci/win-arm64-dbg/targets/chromium.win.json +++ b/infra/config/generated/builders/ci/win-arm64-dbg/targets/chromium.win.json
@@ -1998,6 +1998,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -2021,6 +2022,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/win-arm64-rel/targets/chromium.win.json b/infra/config/generated/builders/ci/win-arm64-rel/targets/chromium.win.json index c138a0aa1..fd58463 100644 --- a/infra/config/generated/builders/ci/win-arm64-rel/targets/chromium.win.json +++ b/infra/config/generated/builders/ci/win-arm64-rel/targets/chromium.win.json
@@ -2257,6 +2257,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2279,6 +2280,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/win-rel-cft/targets/chromium.cft.json b/infra/config/generated/builders/ci/win-rel-cft/targets/chromium.cft.json index 7ac3902..e9735b46 100644 --- a/infra/config/generated/builders/ci/win-rel-cft/targets/chromium.cft.json +++ b/infra/config/generated/builders/ci/win-rel-cft/targets/chromium.cft.json
@@ -2123,6 +2123,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/win-swangle-chromium-x86/targets/chromium.swangle.json b/infra/config/generated/builders/ci/win-swangle-chromium-x86/targets/chromium.swangle.json index 29b4bfa..3df9e96 100644 --- a/infra/config/generated/builders/ci/win-swangle-chromium-x86/targets/chromium.swangle.json +++ b/infra/config/generated/builders/ci/win-swangle-chromium-x86/targets/chromium.swangle.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/win10-angle-chromium-x64-intel/targets/chromium.angle.json b/infra/config/generated/builders/ci/win10-angle-chromium-x64-intel/targets/chromium.angle.json index bcbfc9bc..7b83785 100644 --- a/infra/config/generated/builders/ci/win10-angle-chromium-x64-intel/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/win10-angle-chromium-x64-intel/targets/chromium.angle.json
@@ -21,6 +21,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -58,6 +59,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -95,6 +97,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -132,6 +135,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -169,6 +173,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/win10-angle-chromium-x64-nvidia/targets/chromium.angle.json b/infra/config/generated/builders/ci/win10-angle-chromium-x64-nvidia/targets/chromium.angle.json index 0e2b6f3..47082ce 100644 --- a/infra/config/generated/builders/ci/win10-angle-chromium-x64-nvidia/targets/chromium.angle.json +++ b/infra/config/generated/builders/ci/win10-angle-chromium-x64-nvidia/targets/chromium.angle.json
@@ -21,6 +21,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -58,6 +59,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -95,6 +97,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -132,6 +135,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/win10-code-coverage/targets/chromium.coverage.json b/infra/config/generated/builders/ci/win10-code-coverage/targets/chromium.coverage.json index 344e10cb..40373615 100644 --- a/infra/config/generated/builders/ci/win10-code-coverage/targets/chromium.coverage.json +++ b/infra/config/generated/builders/ci/win10-code-coverage/targets/chromium.coverage.json
@@ -1710,6 +1710,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1746,6 +1747,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/ci/win10-rel-no-external-ip/targets/chromium.fyi.json b/infra/config/generated/builders/ci/win10-rel-no-external-ip/targets/chromium.fyi.json index 16b6366c..4ccebd0 100644 --- a/infra/config/generated/builders/ci/win10-rel-no-external-ip/targets/chromium.fyi.json +++ b/infra/config/generated/builders/ci/win10-rel-no-external-ip/targets/chromium.fyi.json
@@ -2427,6 +2427,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/win11-arm64-dbg-tests/targets/chromium.win.json b/infra/config/generated/builders/ci/win11-arm64-dbg-tests/targets/chromium.win.json index d23caf9b..49e60006 100644 --- a/infra/config/generated/builders/ci/win11-arm64-dbg-tests/targets/chromium.win.json +++ b/infra/config/generated/builders/ci/win11-arm64-dbg-tests/targets/chromium.win.json
@@ -1993,6 +1993,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -2016,6 +2017,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/ci/win11-arm64-rel-tests/targets/chromium.win.json b/infra/config/generated/builders/ci/win11-arm64-rel-tests/targets/chromium.win.json index 95a0f59..04f3cfa 100644 --- a/infra/config/generated/builders/ci/win11-arm64-rel-tests/targets/chromium.win.json +++ b/infra/config/generated/builders/ci/win11-arm64-rel-tests/targets/chromium.win.json
@@ -2251,6 +2251,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2273,6 +2274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/android-12-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/try/android-12-x64-rel/targets/chromium.android.json index c464b7e..d0bb3452 100644 --- a/infra/config/generated/builders/try/android-12-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/try/android-12-x64-rel/targets/chromium.android.json
@@ -3910,6 +3910,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-13-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/try/android-13-x64-rel/targets/chromium.android.json index d019fcc..1307cf6 100644 --- a/infra/config/generated/builders/try/android-13-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/try/android-13-x64-rel/targets/chromium.android.json
@@ -3745,6 +3745,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-15-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/try/android-15-x64-rel/targets/chromium.android.json index 7b8a1576..2845c94 100644 --- a/infra/config/generated/builders/try/android-15-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/try/android-15-x64-rel/targets/chromium.android.json
@@ -3951,6 +3951,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-16-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/try/android-16-x64-rel/targets/chromium.android.json index f5b1632a..d46bc773 100644 --- a/infra/config/generated/builders/try/android-16-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/try/android-16-x64-rel/targets/chromium.android.json
@@ -3770,6 +3770,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-angle-chromium-try/targets/chromium.angle.json b/infra/config/generated/builders/try/android-angle-chromium-try/targets/chromium.angle.json index 4275415..2b50c14 100644 --- a/infra/config/generated/builders/try/android-angle-chromium-try/targets/chromium.angle.json +++ b/infra/config/generated/builders/try/android-angle-chromium-try/targets/chromium.angle.json
@@ -20,6 +20,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-arm64-rel/targets/chromium.gpu.json b/infra/config/generated/builders/try/android-arm64-rel/targets/chromium.gpu.json index 416e0e0..f8e94152 100644 --- a/infra/config/generated/builders/try/android-arm64-rel/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/android-arm64-rel/targets/chromium.gpu.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -62,6 +63,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -107,6 +109,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -147,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -191,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -235,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -281,6 +287,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -321,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -362,6 +370,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-dawn-arm-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/android-dawn-arm-rel/targets/chromium.dawn.json index 9525344..0dfb2d1 100644 --- a/infra/config/generated/builders/try/android-dawn-arm-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/android-dawn-arm-rel/targets/chromium.dawn.json
@@ -106,6 +106,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -147,6 +148,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -188,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -230,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-dawn-arm64-exp-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/android-dawn-arm64-exp-rel/targets/chromium.dawn.json index 1184b643..ff5205b8 100644 --- a/infra/config/generated/builders/try/android-dawn-arm64-exp-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/android-dawn-arm64-exp-rel/targets/chromium.dawn.json
@@ -107,6 +107,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -149,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -191,6 +193,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -232,6 +235,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -274,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-dawn-arm64-p10-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/android-dawn-arm64-p10-rel/targets/chromium.dawn.json index a58f631..936b7754 100644 --- a/infra/config/generated/builders/try/android-dawn-arm64-p10-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/android-dawn-arm64-p10-rel/targets/chromium.dawn.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-dawn-arm64-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/android-dawn-arm64-rel/targets/chromium.dawn.json index 492dbe9..709359a 100644 --- a/infra/config/generated/builders/try/android-dawn-arm64-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/android-dawn-arm64-rel/targets/chromium.dawn.json
@@ -105,6 +105,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -146,6 +147,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -187,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -227,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -268,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/targets/chromium.dawn.json index 1588e73..478dc4cd 100644 --- a/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/android-dawn-arm64-s24-rel/targets/chromium.dawn.json
@@ -20,6 +20,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-structured-test-ids-16-x64-rel-fyi/targets/chromium.android.fyi.json b/infra/config/generated/builders/try/android-structured-test-ids-16-x64-rel-fyi/targets/chromium.android.fyi.json index e0be696..ead516c2 100644 --- a/infra/config/generated/builders/try/android-structured-test-ids-16-x64-rel-fyi/targets/chromium.android.fyi.json +++ b/infra/config/generated/builders/try/android-structured-test-ids-16-x64-rel-fyi/targets/chromium.android.fyi.json
@@ -4170,6 +4170,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android-x64-rel/targets/chromium.android.json b/infra/config/generated/builders/try/android-x64-rel/targets/chromium.android.json index d40f3a4..30ff08e 100644 --- a/infra/config/generated/builders/try/android-x64-rel/targets/chromium.android.json +++ b/infra/config/generated/builders/try/android-x64-rel/targets/chromium.android.json
@@ -4010,6 +4010,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//build/private_code_test:private_code_failure_test", + "module_scheme": "single", "name": "private_code_failure_test", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/android_optional_gpu_tests_rel/targets/tryserver.chromium.android.json b/infra/config/generated/builders/try/android_optional_gpu_tests_rel/targets/tryserver.chromium.android.json index d845d51..1d3a407 100644 --- a/infra/config/generated/builders/try/android_optional_gpu_tests_rel/targets/tryserver.chromium.android.json +++ b/infra/config/generated/builders/try/android_optional_gpu_tests_rel/targets/tryserver.chromium.android.json
@@ -22,6 +22,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_webview", + "module_scheme": "flat", "name": "android_webview_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -63,6 +64,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -99,6 +101,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -139,6 +142,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -184,6 +188,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -225,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -261,6 +267,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -301,6 +308,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -341,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -386,6 +395,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -428,6 +438,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -465,6 +476,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -501,6 +513,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -537,6 +550,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -575,6 +589,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -614,6 +629,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_validating_tests", "resultdb": { "enable": true, @@ -652,6 +668,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -690,6 +707,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -727,6 +745,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-gtest-and-tast/targets/chromium.chromiumos.json b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-gtest-and-tast/targets/chromium.chromiumos.json index 13829fc7..ee97336 100644 --- a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-gtest-and-tast/targets/chromium.chromiumos.json +++ b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-gtest-and-tast/targets/chromium.chromiumos.json
@@ -1078,6 +1078,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-gtest/targets/chromium.chromiumos.json b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-gtest/targets/chromium.chromiumos.json index 46e18aa..d7c1250b 100644 --- a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-gtest/targets/chromium.chromiumos.json +++ b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-gtest/targets/chromium.chromiumos.json
@@ -1078,6 +1078,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/chromeos-structured-test-ids-amd64-generic-rel-gtest-and-tast-fyi/targets/chromium.fyi.json b/infra/config/generated/builders/try/chromeos-structured-test-ids-amd64-generic-rel-gtest-and-tast-fyi/targets/chromium.fyi.json index b5ed6f9..926dc07 100644 --- a/infra/config/generated/builders/try/chromeos-structured-test-ids-amd64-generic-rel-gtest-and-tast-fyi/targets/chromium.fyi.json +++ b/infra/config/generated/builders/try/chromeos-structured-test-ids-amd64-generic-rel-gtest-and-tast-fyi/targets/chromium.fyi.json
@@ -1241,6 +1241,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-android-arm-deps-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-android-arm-deps-rel/targets/chromium.dawn.json index 1c9198e..a4e290e5e 100644 --- a/infra/config/generated/builders/try/dawn-android-arm-deps-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-android-arm-deps-rel/targets/chromium.dawn.json
@@ -106,6 +106,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -147,6 +148,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -188,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -230,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-android-arm64-deps-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-android-arm64-deps-rel/targets/chromium.dawn.json index 91bc7748..e672b0f 100644 --- a/infra/config/generated/builders/try/dawn-android-arm64-deps-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-android-arm64-deps-rel/targets/chromium.dawn.json
@@ -105,6 +105,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -146,6 +147,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -187,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -227,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -268,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-chromium-presubmit/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-chromium-presubmit/targets/chromium.dawn.json index f555903f..a2fde44 100644 --- a/infra/config/generated/builders/try/dawn-chromium-presubmit/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-chromium-presubmit/targets/chromium.dawn.json
@@ -6,6 +6,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/targets/chromium.dawn.json index 0d9bbed..b9aebc92 100644 --- a/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-linux-x64-deps-rel/targets/chromium.dawn.json
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -341,6 +342,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -378,6 +380,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -417,6 +420,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -521,6 +525,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -562,6 +567,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -823,6 +829,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -923,6 +930,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -960,6 +968,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -998,6 +1007,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1035,6 +1045,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -1072,6 +1083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -1108,6 +1120,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1146,6 +1159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1250,6 +1264,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1290,6 +1305,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-mac-arm64-deps-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-mac-arm64-deps-rel/targets/chromium.dawn.json index c247fad4..d6db9a8 100644 --- a/infra/config/generated/builders/try/dawn-mac-arm64-deps-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-mac-arm64-deps-rel/targets/chromium.dawn.json
@@ -263,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -413,6 +415,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -454,6 +457,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -494,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -536,6 +541,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -648,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -692,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/targets/chromium.dawn.json index 6355af1..1d929f0 100644 --- a/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-mac-x64-deps-rel/targets/chromium.dawn.json
@@ -256,6 +256,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -361,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -402,6 +404,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -511,6 +514,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -554,6 +558,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -819,6 +824,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -918,6 +924,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -957,6 +964,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1060,6 +1068,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1101,6 +1110,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-linux-x64-intel-uhd770-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-linux-x64-intel-uhd770-rel/targets/chromium.dawn.json index 23633a9..809752cb 100644 --- a/infra/config/generated/builders/try/dawn-try-linux-x64-intel-uhd770-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-linux-x64-intel-uhd770-rel/targets/chromium.dawn.json
@@ -248,6 +248,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -351,6 +352,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -390,6 +392,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -428,6 +431,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -466,6 +470,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -503,6 +508,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -542,6 +548,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -649,6 +656,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -690,6 +698,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-mac-amd-exp/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-mac-amd-exp/targets/chromium.dawn.json index a7b82f8..dce268d 100644 --- a/infra/config/generated/builders/try/dawn-try-mac-amd-exp/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-mac-amd-exp/targets/chromium.dawn.json
@@ -264,6 +264,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -414,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -526,6 +529,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -570,6 +574,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-mac-arm64-deps-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-mac-arm64-deps-rel/targets/chromium.dawn.json index c247fad4..d6db9a8 100644 --- a/infra/config/generated/builders/try/dawn-try-mac-arm64-deps-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-mac-arm64-deps-rel/targets/chromium.dawn.json
@@ -263,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -413,6 +415,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -454,6 +457,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -494,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -536,6 +541,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -648,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -692,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-mac-arm64-m2-exp/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-mac-arm64-m2-exp/targets/chromium.dawn.json index 7807582..af13544 100644 --- a/infra/config/generated/builders/try/dawn-try-mac-arm64-m2-exp/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-mac-arm64-m2-exp/targets/chromium.dawn.json
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": {
diff --git a/infra/config/generated/builders/try/dawn-try-mac-arm64-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-mac-arm64-rel/targets/chromium.dawn.json index 065f4b0b..a6ae873 100644 --- a/infra/config/generated/builders/try/dawn-try-mac-arm64-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-mac-arm64-rel/targets/chromium.dawn.json
@@ -263,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -413,6 +415,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -454,6 +457,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -494,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -536,6 +541,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -648,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -692,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-mac-intel-exp/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-mac-intel-exp/targets/chromium.dawn.json index 9d3f858..7c01542 100644 --- a/infra/config/generated/builders/try/dawn-try-mac-intel-exp/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-mac-intel-exp/targets/chromium.dawn.json
@@ -248,6 +248,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -350,6 +351,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -390,6 +392,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -496,6 +499,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -538,6 +542,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-win-x64-intel-exp/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-win-x64-intel-exp/targets/chromium.dawn.json index a30a59e..2762b334 100644 --- a/infra/config/generated/builders/try/dawn-try-win-x64-intel-exp/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-win-x64-intel-exp/targets/chromium.dawn.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": {
diff --git a/infra/config/generated/builders/try/dawn-try-win-x64-intel-uhd770-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-win-x64-intel-uhd770-rel/targets/chromium.dawn.json index d279c05..adf0b79 100644 --- a/infra/config/generated/builders/try/dawn-try-win-x64-intel-uhd770-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-win-x64-intel-uhd770-rel/targets/chromium.dawn.json
@@ -300,6 +300,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -400,6 +401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -439,6 +441,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -480,6 +483,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -519,6 +523,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -557,6 +562,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -594,6 +600,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -633,6 +640,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -736,6 +744,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -777,6 +786,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-win-x64-nvidia-exp/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-win-x64-nvidia-exp/targets/chromium.dawn.json index 485c7d9..61ed2a4 100644 --- a/infra/config/generated/builders/try/dawn-try-win-x64-nvidia-exp/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-win-x64-nvidia-exp/targets/chromium.dawn.json
@@ -310,6 +310,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -413,6 +414,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -453,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -495,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -535,6 +539,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -574,6 +579,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -612,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -652,6 +659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -758,6 +766,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -800,6 +809,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-win-x86-intel-exp/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-win-x86-intel-exp/targets/chromium.dawn.json index d183014db..72f46f4 100644 --- a/infra/config/generated/builders/try/dawn-try-win-x86-intel-exp/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-win-x86-intel-exp/targets/chromium.dawn.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": {
diff --git a/infra/config/generated/builders/try/dawn-try-win-x86-nvidia-exp/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-win-x86-nvidia-exp/targets/chromium.dawn.json index 28b827b0..1dc2b90 100644 --- a/infra/config/generated/builders/try/dawn-try-win-x86-nvidia-exp/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-win-x86-nvidia-exp/targets/chromium.dawn.json
@@ -249,6 +249,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -353,6 +354,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -395,6 +397,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -501,6 +504,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -543,6 +547,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-win10-x64-intel-asan/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-win10-x64-intel-asan/targets/chromium.dawn.json index d003a48..a519e1a 100644 --- a/infra/config/generated/builders/try/dawn-try-win10-x64-intel-asan/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-win10-x64-intel-asan/targets/chromium.dawn.json
@@ -240,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -378,6 +380,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-win10-x64-nvidia-asan/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-win10-x64-nvidia-asan/targets/chromium.dawn.json index a20bb23..56bc1df6 100644 --- a/infra/config/generated/builders/try/dawn-try-win10-x64-nvidia-asan/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-win10-x64-nvidia-asan/targets/chromium.dawn.json
@@ -240,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -340,6 +341,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -378,6 +380,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -417,6 +420,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -455,6 +459,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -492,6 +497,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-try-win10-x86-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-try-win10-x86-rel/targets/chromium.dawn.json index 2b7f6c9..3fb5fb87 100644 --- a/infra/config/generated/builders/try/dawn-try-win10-x86-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-try-win10-x86-rel/targets/chromium.dawn.json
@@ -240,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -341,6 +342,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -444,6 +446,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -707,6 +710,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -808,6 +812,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -911,6 +916,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -952,6 +958,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/targets/chromium.dawn.json index 9a9acf00..4bfb9ff9 100644 --- a/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-win10-x64-deps-rel/targets/chromium.dawn.json
@@ -299,6 +299,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -368,6 +369,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -409,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -447,6 +450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -550,6 +554,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -872,6 +877,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -972,6 +978,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1011,6 +1018,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -1052,6 +1060,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -1091,6 +1100,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -1129,6 +1139,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -1166,6 +1177,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1205,6 +1217,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1308,6 +1321,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1349,6 +1363,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/targets/chromium.dawn.json index ef46fa8..072053e 100644 --- a/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/dawn-win10-x86-deps-rel/targets/chromium.dawn.json
@@ -240,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -341,6 +342,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -444,6 +446,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -707,6 +710,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -808,6 +812,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -911,6 +916,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -952,6 +958,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/fuchsia-fyi-x64-asan/targets/chromium.fuchsia.fyi.json b/infra/config/generated/builders/try/fuchsia-fyi-x64-asan/targets/chromium.fuchsia.fyi.json index 9e7f1df..30fe9c1 100644 --- a/infra/config/generated/builders/try/fuchsia-fyi-x64-asan/targets/chromium.fuchsia.fyi.json +++ b/infra/config/generated/builders/try/fuchsia-fyi-x64-asan/targets/chromium.fuchsia.fyi.json
@@ -1557,6 +1557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1593,6 +1594,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1630,6 +1632,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1662,6 +1665,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1698,6 +1702,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1736,6 +1741,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/fuchsia-netstack2-x64-cast-receiver-rel/targets/chromium.fuchsia.fyi.json b/infra/config/generated/builders/try/fuchsia-netstack2-x64-cast-receiver-rel/targets/chromium.fuchsia.fyi.json index c5293bfa..07c1a48 100644 --- a/infra/config/generated/builders/try/fuchsia-netstack2-x64-cast-receiver-rel/targets/chromium.fuchsia.fyi.json +++ b/infra/config/generated/builders/try/fuchsia-netstack2-x64-cast-receiver-rel/targets/chromium.fuchsia.fyi.json
@@ -1904,6 +1904,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1943,6 +1944,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1983,6 +1985,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -2018,6 +2021,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -2057,6 +2061,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2098,6 +2103,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-dbg-compile/targets/chromium.fuchsia.json b/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-dbg-compile/targets/chromium.fuchsia.json index 2f07300..ba9ac36db5 100644 --- a/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-dbg-compile/targets/chromium.fuchsia.json +++ b/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-dbg-compile/targets/chromium.fuchsia.json
@@ -1643,6 +1643,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1680,6 +1681,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1718,6 +1720,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1751,6 +1754,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1788,6 +1792,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1827,6 +1832,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-dbg/targets/chromium.fuchsia.json b/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-dbg/targets/chromium.fuchsia.json index 2f07300..ba9ac36db5 100644 --- a/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-dbg/targets/chromium.fuchsia.json +++ b/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-dbg/targets/chromium.fuchsia.json
@@ -1643,6 +1643,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1680,6 +1681,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1718,6 +1720,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1751,6 +1754,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1788,6 +1792,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1827,6 +1832,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel/targets/chromium.fuchsia.json b/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel/targets/chromium.fuchsia.json index 7dc16e7..e8936a3 100644 --- a/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel/targets/chromium.fuchsia.json +++ b/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel/targets/chromium.fuchsia.json
@@ -1836,6 +1836,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1874,6 +1875,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1913,6 +1915,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1947,6 +1950,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1985,6 +1989,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2025,6 +2030,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/fuchsia-x64-perf-cast-receiver-rel/targets/chromium.fuchsia.fyi.json b/infra/config/generated/builders/try/fuchsia-x64-perf-cast-receiver-rel/targets/chromium.fuchsia.fyi.json index 94887c0..4ddbc74 100644 --- a/infra/config/generated/builders/try/fuchsia-x64-perf-cast-receiver-rel/targets/chromium.fuchsia.fyi.json +++ b/infra/config/generated/builders/try/fuchsia-x64-perf-cast-receiver-rel/targets/chromium.fuchsia.fyi.json
@@ -1833,6 +1833,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -1871,6 +1872,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -1910,6 +1912,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -1944,6 +1947,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -1982,6 +1986,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -2022,6 +2027,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//content/test:telemetry_gpu_integration_test_fuchsia", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/targets/chromium.gpu.fyi.json index ab8c840..e43a51f1 100644 --- a/infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-cq-android-arm64/targets/chromium.gpu.fyi.json
@@ -185,6 +185,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -224,6 +225,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -263,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -306,6 +309,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -354,6 +358,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -402,6 +407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -530,6 +538,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -573,6 +582,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -621,6 +631,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -669,6 +680,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -714,6 +726,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -754,6 +767,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -794,6 +808,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -833,6 +848,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -872,6 +888,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_graphite_tests", "resultdb": { "enable": true, @@ -911,6 +928,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -951,6 +969,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -992,6 +1011,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1033,6 +1053,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -1074,6 +1095,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_graphite_tests", "resultdb": { "enable": true, @@ -1114,6 +1136,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_graphite_tests", "resultdb": { "enable": true, @@ -1153,6 +1176,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-a13-32/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-a13-32/targets/chromium.gpu.fyi.json index ce46859..a51cdbc 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-a13-32/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-a13-32/targets/chromium.gpu.fyi.json
@@ -192,6 +192,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -237,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -283,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -369,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -414,6 +419,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -461,6 +467,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -502,6 +509,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -544,6 +552,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-a23-32/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-a23-32/targets/chromium.gpu.fyi.json index ca73b89..43279f8 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-a23-32/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-a23-32/targets/chromium.gpu.fyi.json
@@ -192,6 +192,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -237,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -283,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -369,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -414,6 +419,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -461,6 +467,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -502,6 +509,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -544,6 +552,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-nvidia-shield-tv/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-nvidia-shield-tv/targets/chromium.gpu.fyi.json index 5a87d13..15a039e 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-nvidia-shield-tv/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-nvidia-shield-tv/targets/chromium.gpu.fyi.json
@@ -185,6 +185,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -228,6 +229,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -311,6 +314,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -354,6 +358,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -397,6 +402,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -442,6 +448,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -481,6 +488,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -521,6 +529,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-10-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-10-64/targets/chromium.gpu.fyi.json index 6942ed9..cfa8970 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-10-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-10-64/targets/chromium.gpu.fyi.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "noop_sleep_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-6-64-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-6-64-exp/targets/chromium.gpu.fyi.json index ae5a0cbf..500b3bc8 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-6-64-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-6-64-exp/targets/chromium.gpu.fyi.json
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -230,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -270,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -314,6 +317,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -363,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -412,6 +417,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -457,6 +463,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -497,6 +504,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -543,6 +551,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -587,6 +596,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -636,6 +646,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -685,6 +696,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -731,6 +743,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -772,6 +785,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -813,6 +827,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -853,6 +868,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -893,6 +909,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_graphite_tests", "resultdb": { "enable": true, @@ -933,6 +950,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -974,6 +992,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1016,6 +1035,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1058,6 +1078,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -1100,6 +1121,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_graphite_tests", "resultdb": { "enable": true, @@ -1141,6 +1163,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_graphite_tests", "resultdb": { "enable": true, @@ -1181,6 +1204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-6-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-6-64/targets/chromium.gpu.fyi.json index ab8c840..e43a51f1 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-6-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-pixel-6-64/targets/chromium.gpu.fyi.json
@@ -185,6 +185,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -224,6 +225,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -263,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -306,6 +309,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -354,6 +358,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -402,6 +407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -530,6 +538,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -573,6 +582,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -621,6 +631,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -669,6 +680,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -714,6 +726,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -754,6 +767,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -794,6 +808,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -833,6 +848,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -872,6 +888,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_graphite_tests", "resultdb": { "enable": true, @@ -911,6 +928,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -951,6 +969,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -992,6 +1011,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1033,6 +1053,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -1074,6 +1095,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_graphite_tests", "resultdb": { "enable": true, @@ -1114,6 +1136,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_graphite_tests", "resultdb": { "enable": true, @@ -1153,6 +1176,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-q-pixel-2-32/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-q-pixel-2-32/targets/chromium.gpu.fyi.json index 33911e5..ee7f144 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-q-pixel-2-32/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-q-pixel-2-32/targets/chromium.gpu.fyi.json
@@ -194,6 +194,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -240,6 +241,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -282,6 +284,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -325,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_validating_tests", "resultdb": { "enable": true, @@ -367,6 +371,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-r-pixel-4-32/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-r-pixel-4-32/targets/chromium.gpu.fyi.json index 87437f1..000bda2 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-r-pixel-4-32/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-r-pixel-4-32/targets/chromium.gpu.fyi.json
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_webview", + "module_scheme": "flat", "name": "android_webview_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -233,6 +234,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -315,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -363,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -407,6 +412,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -489,6 +496,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -532,6 +540,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -580,6 +589,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -625,6 +635,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -665,6 +676,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -704,6 +716,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -743,6 +756,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -784,6 +798,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -826,6 +841,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl2_conformance_validating_tests", "resultdb": { "enable": true, @@ -867,6 +883,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -908,6 +925,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_ganesh_tests", "resultdb": { "enable": true, @@ -948,6 +966,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-android-s23-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-android-s23-64/targets/chromium.gpu.fyi.json index 0b4d2f3..09a5161f 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-android-s23-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-android-s23-64/targets/chromium.gpu.fyi.json
@@ -191,6 +191,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -236,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -282,6 +284,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -323,6 +326,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -413,6 +418,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -460,6 +466,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -501,6 +508,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -543,6 +551,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-chromeos-amd64-generic/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-chromeos-amd64-generic/targets/chromium.gpu.fyi.json index fb163ed2..f475ba1 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-chromeos-amd64-generic/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-chromeos-amd64-generic/targets/chromium.gpu.fyi.json
@@ -112,6 +112,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -167,6 +168,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -223,6 +225,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -274,6 +277,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -329,6 +333,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -384,6 +389,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -441,6 +447,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -492,6 +499,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -543,6 +551,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -596,6 +605,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -649,6 +659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -701,6 +712,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-780m-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-780m-exp/targets/chromium.gpu.fyi.json index 74e9d2654..5f33c8a 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-780m-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-780m-exp/targets/chromium.gpu.fyi.json
@@ -196,6 +196,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -238,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -281,6 +283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -319,6 +322,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -361,6 +365,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -403,6 +408,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -447,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -523,6 +531,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -563,6 +572,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -603,6 +613,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-890m-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-890m-exp/targets/chromium.gpu.fyi.json index fe3ef0f..47e685e 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-890m-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-890m-exp/targets/chromium.gpu.fyi.json
@@ -196,6 +196,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -238,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -281,6 +283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -319,6 +322,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -361,6 +365,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -403,6 +408,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -447,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -523,6 +531,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -563,6 +572,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -603,6 +613,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-rel/targets/chromium.gpu.fyi.json index 53a8354..5f7a92b 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-rel/targets/chromium.gpu.fyi.json
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -231,6 +232,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -273,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -310,6 +313,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -351,6 +355,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -392,6 +397,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -435,6 +441,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -472,6 +479,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -509,6 +517,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -548,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -587,6 +597,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-rx-7600-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-rx-7600-rel/targets/chromium.gpu.fyi.json index 53bcd87..d83f006 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-rx-7600-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-amd-rx-7600-rel/targets/chromium.gpu.fyi.json
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -231,6 +232,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -273,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -310,6 +313,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -351,6 +355,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -392,6 +397,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -435,6 +441,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -472,6 +479,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -509,6 +517,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -548,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -587,6 +597,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-arc-140v-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-arc-140v-exp/targets/chromium.gpu.fyi.json index 4e39e65a..da9a8a0 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-arc-140v-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-arc-140v-exp/targets/chromium.gpu.fyi.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-exp/targets/chromium.gpu.fyi.json index 7a5e67f..662c62e 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-exp/targets/chromium.gpu.fyi.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-rel/targets/chromium.gpu.fyi.json index 3475861..22f32e8 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-rel/targets/chromium.gpu.fyi.json
@@ -156,6 +156,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -196,6 +197,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -237,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -273,6 +276,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -313,6 +317,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -353,6 +358,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -395,6 +401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -431,6 +438,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -467,6 +475,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -505,6 +514,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -543,6 +553,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-uhd770-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-uhd770-rel/targets/chromium.gpu.fyi.json index 73fc096..8ad5209 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-uhd770-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-intel-uhd770-rel/targets/chromium.gpu.fyi.json
@@ -191,6 +191,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -232,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -274,6 +276,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -311,6 +314,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -352,6 +356,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -393,6 +398,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -436,6 +442,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -473,6 +480,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -510,6 +518,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -549,6 +558,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -588,6 +598,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-dbg/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-dbg/targets/chromium.gpu.fyi.json index cc96548..269f351 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-dbg/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-dbg/targets/chromium.gpu.fyi.json
@@ -79,6 +79,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -119,6 +120,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -160,6 +162,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -196,6 +199,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -236,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -276,6 +281,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -318,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -354,6 +361,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -391,6 +399,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-exp/targets/chromium.gpu.fyi.json index cce53c1..2d0bbf20 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-exp/targets/chromium.gpu.fyi.json
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -231,6 +232,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -273,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -310,6 +313,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -351,6 +355,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -392,6 +397,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -435,6 +441,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -472,6 +479,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -513,6 +521,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "vulkan_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -555,6 +564,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -594,6 +604,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -633,6 +644,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-rel/targets/chromium.gpu.fyi.json index 3151898..e74be350 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-nvidia-rel/targets/chromium.gpu.fyi.json
@@ -156,6 +156,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -196,6 +197,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -237,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -273,6 +276,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -313,6 +317,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -353,6 +358,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -395,6 +401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -431,6 +438,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -471,6 +479,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "vulkan_pixel_skia_gold_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -512,6 +521,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -550,6 +560,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -588,6 +599,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-wayland-amd-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-wayland-amd-rel/targets/chromium.gpu.fyi.json index 8e0d0c13..9d0c432 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-wayland-amd-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-wayland-amd-rel/targets/chromium.gpu.fyi.json
@@ -55,6 +55,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-linux-wayland-intel-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-linux-wayland-intel-rel/targets/chromium.gpu.fyi.json index 942a9b251..a8d6a076 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-linux-wayland-intel-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-linux-wayland-intel-rel/targets/chromium.gpu.fyi.json
@@ -54,6 +54,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -98,6 +99,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -143,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -183,6 +186,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -227,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -271,6 +276,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -317,6 +323,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -357,6 +364,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -397,6 +405,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -438,6 +447,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gles_passthrough_tests", "resultdb": { "enable": true, @@ -479,6 +489,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-pro-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-pro-rel/targets/chromium.gpu.fyi.json index a989a27..0d5c824 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-pro-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-pro-rel/targets/chromium.gpu.fyi.json
@@ -157,6 +157,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -199,6 +200,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -242,6 +244,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -280,6 +283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -322,6 +326,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -364,6 +369,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -408,6 +414,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -446,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -486,6 +494,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -526,6 +535,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-asan/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-asan/targets/chromium.gpu.fyi.json index 1aa38244..d0ce8e0 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-asan/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-asan/targets/chromium.gpu.fyi.json
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -233,6 +234,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -281,6 +283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -326,6 +329,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -365,6 +369,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -406,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -447,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -488,6 +495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -527,6 +535,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -566,6 +575,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -605,6 +615,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-dbg/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-dbg/targets/chromium.gpu.fyi.json index 0b60734..6668599 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-dbg/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-dbg/targets/chromium.gpu.fyi.json
@@ -160,6 +160,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -203,6 +204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -247,6 +249,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -286,6 +289,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -329,6 +333,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -372,6 +377,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -418,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -457,6 +464,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -497,6 +505,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-exp/targets/chromium.gpu.fyi.json index fc3d479..b72a827b 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-exp/targets/chromium.gpu.fyi.json
@@ -196,6 +196,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -236,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -276,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -320,6 +323,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -369,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -418,6 +423,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -463,6 +469,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -503,6 +510,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -547,6 +555,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -591,6 +600,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -640,6 +650,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -689,6 +700,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -735,6 +747,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -776,6 +789,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -817,6 +831,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -857,6 +872,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -897,6 +913,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -937,6 +954,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -977,6 +995,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1019,6 +1038,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1063,6 +1083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1105,6 +1126,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1148,6 +1170,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1190,6 +1213,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1231,6 +1255,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1271,6 +1296,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1311,6 +1337,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1351,6 +1378,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-rel/targets/chromium.gpu.fyi.json index 94c8a92..7405e40 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-amd-retina-rel/targets/chromium.gpu.fyi.json
@@ -190,6 +190,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -229,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -272,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -320,6 +323,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -364,6 +368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -403,6 +408,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -494,6 +501,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -539,6 +547,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -579,6 +588,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -618,6 +628,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -657,6 +668,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -696,6 +708,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -737,6 +750,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -780,6 +794,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -821,6 +836,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -863,6 +879,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -903,6 +920,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -942,6 +960,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -981,6 +1000,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1020,6 +1040,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m1-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m1-exp/targets/chromium.gpu.fyi.json index 011d671..5eadcaa 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m1-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m1-exp/targets/chromium.gpu.fyi.json
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -232,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -276,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -315,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -358,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -401,6 +406,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -524,6 +532,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -566,6 +575,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -608,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -648,6 +659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -687,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m1-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m1-rel/targets/chromium.gpu.fyi.json index 49254676..e73e486 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m1-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m1-rel/targets/chromium.gpu.fyi.json
@@ -189,6 +189,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -232,6 +233,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -276,6 +278,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -315,6 +318,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -358,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -401,6 +406,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -446,6 +452,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -524,6 +532,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -566,6 +575,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -608,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -648,6 +659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -687,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m2-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m2-exp/targets/chromium.gpu.fyi.json index 422170a..f711e6c 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m2-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m2-exp/targets/chromium.gpu.fyi.json
@@ -17,6 +17,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m2-retina-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m2-retina-rel/targets/chromium.gpu.fyi.json index 932ae5e..09bc11bb 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m2-retina-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m2-retina-rel/targets/chromium.gpu.fyi.json
@@ -195,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -239,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -284,6 +286,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -412,6 +417,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -458,6 +464,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -498,6 +505,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -538,6 +546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -581,6 +590,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -624,6 +634,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -665,6 +676,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -705,6 +717,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m3-retina-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m3-retina-rel/targets/chromium.gpu.fyi.json index 2c03a225..ebe2160f 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m3-retina-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-arm64-apple-m3-retina-rel/targets/chromium.gpu.fyi.json
@@ -195,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -239,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -284,6 +286,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -368,6 +372,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -412,6 +417,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -458,6 +464,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -498,6 +505,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -538,6 +546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -581,6 +590,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -624,6 +634,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -665,6 +676,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -705,6 +717,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-asan/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-asan/targets/chromium.gpu.fyi.json index 876c9a4..111bafe 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-asan/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-asan/targets/chromium.gpu.fyi.json
@@ -178,6 +178,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -215,6 +216,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -252,6 +254,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -293,6 +296,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -339,6 +343,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -385,6 +390,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -427,6 +433,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -464,6 +471,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -505,6 +513,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -546,6 +555,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -593,6 +603,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -640,6 +651,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -684,6 +696,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -722,6 +735,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -760,6 +774,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -797,6 +812,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -835,6 +851,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -872,6 +889,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -909,6 +927,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -948,6 +967,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -987,6 +1007,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1026,6 +1047,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1063,6 +1085,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1100,6 +1123,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1137,6 +1161,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-dbg/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-dbg/targets/chromium.gpu.fyi.json index ae67350c33..8b628d83 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-dbg/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-dbg/targets/chromium.gpu.fyi.json
@@ -150,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -191,6 +192,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -233,6 +235,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -270,6 +273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -311,6 +315,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -352,6 +357,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -396,6 +402,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -433,6 +440,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -471,6 +479,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-exp/targets/chromium.gpu.fyi.json index 046ed92..21ee02c 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-exp/targets/chromium.gpu.fyi.json
@@ -184,6 +184,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -222,6 +223,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -260,6 +262,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -302,6 +305,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -349,6 +353,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -396,6 +401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -439,6 +445,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -477,6 +484,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -519,6 +527,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -561,6 +570,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -608,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -655,6 +666,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -699,6 +711,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -738,6 +751,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -777,6 +791,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -815,6 +830,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -853,6 +869,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -891,6 +908,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -929,6 +947,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -969,6 +988,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1011,6 +1031,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1051,6 +1072,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1092,6 +1114,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1132,6 +1155,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -1171,6 +1195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -1209,6 +1234,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1247,6 +1273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -1285,6 +1312,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-rel/targets/chromium.gpu.fyi.json index 38cc2c3..739dac5 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-mac-intel-rel/targets/chromium.gpu.fyi.json
@@ -178,6 +178,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -215,6 +216,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -256,6 +258,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -302,6 +305,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -344,6 +348,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -381,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -422,6 +428,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -468,6 +475,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -511,6 +519,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -549,6 +558,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -586,6 +596,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -623,6 +634,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -660,6 +672,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -699,6 +712,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -740,6 +754,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -779,6 +794,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -819,6 +835,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -857,6 +874,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -894,6 +912,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -931,6 +950,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -968,6 +988,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-amd-rel-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-amd-rel-64/targets/chromium.gpu.fyi.json index 29f3df0..aecfb7b 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-amd-rel-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-amd-rel-64/targets/chromium.gpu.fyi.json
@@ -204,6 +204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -245,6 +246,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -287,6 +289,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -324,6 +327,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -365,6 +369,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -406,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -449,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -486,6 +493,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -523,6 +531,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -562,6 +571,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -601,6 +611,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -640,6 +651,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -678,6 +690,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-exp-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-exp-64/targets/chromium.gpu.fyi.json index 2867cbd..f185c2f 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-exp-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-exp-64/targets/chromium.gpu.fyi.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-rel-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-rel-64/targets/chromium.gpu.fyi.json index 2c9c783e..746dc02 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-rel-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-rel-64/targets/chromium.gpu.fyi.json
@@ -230,6 +230,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -271,6 +272,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -313,6 +315,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -350,6 +353,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -391,6 +395,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -432,6 +437,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -475,6 +481,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -512,6 +519,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -549,6 +557,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -588,6 +597,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -627,6 +637,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -666,6 +677,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -705,6 +717,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -743,6 +756,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-uhd770-rel/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-uhd770-rel/targets/chromium.gpu.fyi.json index 16d17e84..4d37259 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-uhd770-rel/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-intel-uhd770-rel/targets/chromium.gpu.fyi.json
@@ -231,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -272,6 +273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -314,6 +316,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -351,6 +354,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -392,6 +396,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -433,6 +438,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -476,6 +482,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -513,6 +520,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -550,6 +558,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -589,6 +598,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -628,6 +638,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -667,6 +678,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -706,6 +718,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -744,6 +757,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dbg-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dbg-64/targets/chromium.gpu.fyi.json index 9837aab..29b081d 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dbg-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dbg-64/targets/chromium.gpu.fyi.json
@@ -175,6 +175,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -216,6 +217,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -258,6 +260,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -295,6 +298,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -336,6 +340,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -377,6 +382,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -420,6 +426,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -457,6 +464,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -495,6 +503,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -534,6 +543,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dx12vk-dbg-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dx12vk-dbg-64/targets/chromium.gpu.fyi.json index 470cb69..53db6b4 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dx12vk-dbg-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dx12vk-dbg-64/targets/chromium.gpu.fyi.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dx12vk-rel-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dx12vk-rel-64/targets/chromium.gpu.fyi.json index 3250094..70ef9ea 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dx12vk-rel-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dx12vk-rel-64/targets/chromium.gpu.fyi.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-exp-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-exp-64/targets/chromium.gpu.fyi.json index 129cc93..a3c8c65 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-exp-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-exp-64/targets/chromium.gpu.fyi.json
@@ -238,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -276,6 +277,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -318,6 +320,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -365,6 +368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -408,6 +412,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -446,6 +451,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -488,6 +494,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -563,6 +570,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -610,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -654,6 +663,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -693,6 +703,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -731,6 +742,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -769,6 +781,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -809,6 +822,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -849,6 +863,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -889,6 +904,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -929,6 +945,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -968,6 +985,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-32/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-32/targets/chromium.gpu.fyi.json index 38a1d21a..185fbc7 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-32/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-32/targets/chromium.gpu.fyi.json
@@ -203,6 +203,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -240,6 +241,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -281,6 +283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -327,6 +330,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -369,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -406,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -447,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -520,6 +527,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -566,6 +574,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -609,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -647,6 +657,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -684,6 +695,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -721,6 +733,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -760,6 +773,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -799,6 +813,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -838,6 +853,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -876,6 +892,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-64/targets/chromium.gpu.fyi.json index 9263631..d2b30d4d 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-64/targets/chromium.gpu.fyi.json
@@ -203,6 +203,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -240,6 +241,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -281,6 +283,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -327,6 +330,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -369,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -406,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -447,6 +453,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -520,6 +527,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -566,6 +574,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -609,6 +618,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -647,6 +657,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -684,6 +695,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -721,6 +733,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -760,6 +773,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -799,6 +813,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -838,6 +853,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -876,6 +892,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win11-amd-rel-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win11-amd-rel-64/targets/chromium.gpu.fyi.json index 19a5f66..a91ec600 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win11-amd-rel-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win11-amd-rel-64/targets/chromium.gpu.fyi.json
@@ -231,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -272,6 +273,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -314,6 +316,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -351,6 +354,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -392,6 +396,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -433,6 +438,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -476,6 +482,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -513,6 +520,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -550,6 +558,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -589,6 +598,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -628,6 +638,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -667,6 +678,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -705,6 +717,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win11-nvidia-4070-exp-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win11-nvidia-4070-exp-64/targets/chromium.gpu.fyi.json index 9f7f14f..5a199c10 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win11-nvidia-4070-exp-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win11-nvidia-4070-exp-64/targets/chromium.gpu.fyi.json
@@ -237,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -275,6 +276,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -317,6 +319,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -364,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -407,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -445,6 +450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -487,6 +493,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -562,6 +569,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -609,6 +617,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -653,6 +662,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -692,6 +702,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -730,6 +741,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -768,6 +780,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -808,6 +821,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -848,6 +862,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -888,6 +903,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -928,6 +944,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -967,6 +984,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win11-nvidia-4070-rel-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win11-nvidia-4070-rel-64/targets/chromium.gpu.fyi.json index 26d4166b..74c12da 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win11-nvidia-4070-rel-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win11-nvidia-4070-rel-64/targets/chromium.gpu.fyi.json
@@ -237,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -275,6 +276,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -317,6 +319,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -364,6 +367,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -407,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -445,6 +450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -487,6 +493,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -562,6 +569,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -609,6 +617,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -653,6 +662,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -692,6 +702,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -730,6 +741,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -768,6 +780,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -808,6 +821,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -848,6 +862,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -888,6 +903,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -928,6 +944,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -967,6 +984,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win11-qualcomm-rel-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win11-qualcomm-rel-64/targets/chromium.gpu.fyi.json index c982854..5fa86a7 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win11-qualcomm-rel-64/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win11-qualcomm-rel-64/targets/chromium.gpu.fyi.json
@@ -219,6 +219,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -262,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -306,6 +308,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -345,6 +348,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -388,6 +392,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -431,6 +436,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -476,6 +482,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -515,6 +522,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -554,6 +562,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -595,6 +604,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -636,6 +646,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -676,6 +687,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-amd-780m-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-amd-780m-exp/targets/chromium.gpu.fyi.json index 5adc835..801851b 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-amd-780m-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-amd-780m-exp/targets/chromium.gpu.fyi.json
@@ -238,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -280,6 +281,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -323,6 +325,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -361,6 +364,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -403,6 +407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -445,6 +450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -489,6 +495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -527,6 +534,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -565,6 +573,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -605,6 +614,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -645,6 +655,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -685,6 +696,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -724,6 +736,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-amd-890m-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-amd-890m-exp/targets/chromium.gpu.fyi.json index b415d4d3..8b4bff7 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-amd-890m-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-amd-890m-exp/targets/chromium.gpu.fyi.json
@@ -238,6 +238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -280,6 +281,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -323,6 +325,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -361,6 +364,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -403,6 +407,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -445,6 +450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -489,6 +495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -527,6 +534,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -565,6 +573,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests", "resultdb": { "enable": true, @@ -605,6 +614,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -645,6 +655,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -685,6 +696,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -724,6 +736,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-intel-arc-140v-exp/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-intel-arc-140v-exp/targets/chromium.gpu.fyi.json index b81189af..212b52a 100644 --- a/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-intel-arc-140v-exp/targets/chromium.gpu.fyi.json +++ b/infra/config/generated/builders/try/gpu-fyi-try-win11-x64-intel-arc-140v-exp/targets/chromium.gpu.fyi.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "containment_type": "AUTO",
diff --git a/infra/config/generated/builders/try/gpu-try-android-pixel-2-64/targets/chromium.gpu.json b/infra/config/generated/builders/try/gpu-try-android-pixel-2-64/targets/chromium.gpu.json index 416e0e0..f8e94152 100644 --- a/infra/config/generated/builders/try/gpu-try-android-pixel-2-64/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/gpu-try-android-pixel-2-64/targets/chromium.gpu.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "context_lost_validating_tests", "resultdb": { "enable": true, @@ -62,6 +63,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "expected_color_pixel_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -107,6 +109,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -147,6 +150,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -191,6 +195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -235,6 +240,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "pixel_skia_gold_validating_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -281,6 +287,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "screenshot_sync_validating_tests", "resultdb": { "enable": true, @@ -321,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -362,6 +370,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test_android_chrome", + "module_scheme": "flat", "name": "webgl_conformance_validating_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-try-linux-nvidia-dbg/targets/chromium.gpu.json b/infra/config/generated/builders/try/gpu-try-linux-nvidia-dbg/targets/chromium.gpu.json index d0329fc0..1977311b 100644 --- a/infra/config/generated/builders/try/gpu-try-linux-nvidia-dbg/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/gpu-try-linux-nvidia-dbg/targets/chromium.gpu.json
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -144,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -185,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -221,6 +224,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -261,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -301,6 +306,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -379,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -416,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-try-linux-nvidia-rel/targets/chromium.gpu.json b/infra/config/generated/builders/try/gpu-try-linux-nvidia-rel/targets/chromium.gpu.json index e88f0c46..0c9bddd 100644 --- a/infra/config/generated/builders/try/gpu-try-linux-nvidia-rel/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/gpu-try-linux-nvidia-rel/targets/chromium.gpu.json
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -144,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -185,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -221,6 +224,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -261,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -301,6 +306,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -379,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -416,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-try-mac-amd-retina-dbg/targets/chromium.gpu.json b/infra/config/generated/builders/try/gpu-try-mac-amd-retina-dbg/targets/chromium.gpu.json index aabef234c..531a346 100644 --- a/infra/config/generated/builders/try/gpu-try-mac-amd-retina-dbg/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/gpu-try-mac-amd-retina-dbg/targets/chromium.gpu.json
@@ -111,6 +111,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -155,6 +156,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -200,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -240,6 +243,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -284,6 +288,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -328,6 +333,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -375,6 +381,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -415,6 +422,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -457,6 +465,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-try-mac-intel-dbg/targets/chromium.gpu.json b/infra/config/generated/builders/try/gpu-try-mac-intel-dbg/targets/chromium.gpu.json index 0b9f89d..36ddc2aa 100644 --- a/infra/config/generated/builders/try/gpu-try-mac-intel-dbg/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/gpu-try-mac-intel-dbg/targets/chromium.gpu.json
@@ -105,6 +105,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -147,6 +148,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -190,6 +192,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -228,6 +231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -270,6 +274,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -312,6 +317,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -356,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -394,6 +401,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -434,6 +442,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/gpu-try-win-nvidia-dbg/targets/chromium.gpu.json b/infra/config/generated/builders/try/gpu-try-win-nvidia-dbg/targets/chromium.gpu.json index b620bec..2283da9 100644 --- a/infra/config/generated/builders/try/gpu-try-win-nvidia-dbg/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/gpu-try-win-nvidia-dbg/targets/chromium.gpu.json
@@ -159,6 +159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -201,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -244,6 +246,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -282,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -324,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -366,6 +371,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -410,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -448,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -487,6 +495,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/leak_detection_linux/targets/chromium.linux.json b/infra/config/generated/builders/try/leak_detection_linux/targets/chromium.linux.json index 9652652..daad51c 100644 --- a/infra/config/generated/builders/try/leak_detection_linux/targets/chromium.linux.json +++ b/infra/config/generated/builders/try/leak_detection_linux/targets/chromium.linux.json
@@ -17,6 +17,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "memory.leak_detection", "swarming": { "dimensions": {
diff --git a/infra/config/generated/builders/try/linux-angle-chromium-try/targets/chromium.angle.json b/infra/config/generated/builders/try/linux-angle-chromium-try/targets/chromium.angle.json index 35b86eae..3c3dd15 100644 --- a/infra/config/generated/builders/try/linux-angle-chromium-try/targets/chromium.angle.json +++ b/infra/config/generated/builders/try/linux-angle-chromium-try/targets/chromium.angle.json
@@ -79,6 +79,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -113,6 +114,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -149,6 +151,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -185,6 +188,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -285,6 +289,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -319,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -355,6 +361,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests", "resultdb": { "enable": true, @@ -391,6 +398,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-code-coverage/targets/chromium.coverage.json b/infra/config/generated/builders/try/linux-code-coverage/targets/chromium.coverage.json index 2e59406..48d2982 100644 --- a/infra/config/generated/builders/try/linux-code-coverage/targets/chromium.coverage.json +++ b/infra/config/generated/builders/try/linux-code-coverage/targets/chromium.coverage.json
@@ -2002,6 +2002,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2201,6 +2202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -2236,6 +2238,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-dawn-intel-exp-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/linux-dawn-intel-exp-rel/targets/chromium.dawn.json index 18db841..55d68a7 100644 --- a/infra/config/generated/builders/try/linux-dawn-intel-exp-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/linux-dawn-intel-exp-rel/targets/chromium.dawn.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "noop_sleep_tests", "swarming": { "dimensions": {
diff --git a/infra/config/generated/builders/try/linux-dawn-nvidia-1660-exp-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/linux-dawn-nvidia-1660-exp-rel/targets/chromium.dawn.json index 08b0260..f24e1f7 100644 --- a/infra/config/generated/builders/try/linux-dawn-nvidia-1660-exp-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/linux-dawn-nvidia-1660-exp-rel/targets/chromium.dawn.json
@@ -247,6 +247,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -350,6 +351,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -388,6 +390,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -427,6 +430,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -465,6 +469,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -503,6 +508,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -540,6 +546,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -579,6 +586,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -686,6 +694,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -727,6 +736,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-dawn-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/linux-dawn-rel/targets/chromium.dawn.json index 4206fc1..3e1c55a9 100644 --- a/infra/config/generated/builders/try/linux-dawn-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/linux-dawn-rel/targets/chromium.dawn.json
@@ -239,6 +239,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -341,6 +342,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -378,6 +380,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -417,6 +420,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -521,6 +525,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -562,6 +567,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -823,6 +829,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -923,6 +930,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_min_es31_tests", "resultdb": { "enable": true, @@ -960,6 +968,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_compat_tests", "resultdb": { "enable": true, @@ -998,6 +1007,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1035,6 +1045,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -1072,6 +1083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -1108,6 +1120,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1146,6 +1159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1250,6 +1264,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1290,6 +1305,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-dcheck-off-rel/targets/chromium.gpu.json b/infra/config/generated/builders/try/linux-dcheck-off-rel/targets/chromium.gpu.json index e88f0c46..0c9bddd 100644 --- a/infra/config/generated/builders/try/linux-dcheck-off-rel/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/linux-dcheck-off-rel/targets/chromium.gpu.json
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -144,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -185,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -221,6 +224,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -261,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -301,6 +306,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -379,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -416,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-dcheck-off-rel/targets/chromium.linux.json b/infra/config/generated/builders/try/linux-dcheck-off-rel/targets/chromium.linux.json index 1e797811..e081b7c 100644 --- a/infra/config/generated/builders/try/linux-dcheck-off-rel/targets/chromium.linux.json +++ b/infra/config/generated/builders/try/linux-dcheck-off-rel/targets/chromium.linux.json
@@ -2205,6 +2205,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2278,6 +2279,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux-full-remote-rel/targets/chromium.gpu.json b/infra/config/generated/builders/try/linux-full-remote-rel/targets/chromium.gpu.json index e88f0c46..0c9bddd 100644 --- a/infra/config/generated/builders/try/linux-full-remote-rel/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/linux-full-remote-rel/targets/chromium.gpu.json
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -144,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -185,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -221,6 +224,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -261,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -301,6 +306,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -379,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -416,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-full-remote-rel/targets/chromium.linux.json b/infra/config/generated/builders/try/linux-full-remote-rel/targets/chromium.linux.json index 1e797811..e081b7c 100644 --- a/infra/config/generated/builders/try/linux-full-remote-rel/targets/chromium.linux.json +++ b/infra/config/generated/builders/try/linux-full-remote-rel/targets/chromium.linux.json
@@ -2205,6 +2205,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2278,6 +2279,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux-rel-cft/targets/chromium.cft.json b/infra/config/generated/builders/try/linux-rel-cft/targets/chromium.cft.json index f964ba6..218b16d1 100644 --- a/infra/config/generated/builders/try/linux-rel-cft/targets/chromium.cft.json +++ b/infra/config/generated/builders/try/linux-rel-cft/targets/chromium.cft.json
@@ -2019,6 +2019,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux-rel-test-selection/targets/chromium.gpu.json b/infra/config/generated/builders/try/linux-rel-test-selection/targets/chromium.gpu.json index e88f0c46..0c9bddd 100644 --- a/infra/config/generated/builders/try/linux-rel-test-selection/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/linux-rel-test-selection/targets/chromium.gpu.json
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -144,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -185,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -221,6 +224,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -261,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -301,6 +306,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -379,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -416,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-rel-test-selection/targets/chromium.linux.json b/infra/config/generated/builders/try/linux-rel-test-selection/targets/chromium.linux.json index 1e797811..e081b7c 100644 --- a/infra/config/generated/builders/try/linux-rel-test-selection/targets/chromium.linux.json +++ b/infra/config/generated/builders/try/linux-rel-test-selection/targets/chromium.linux.json
@@ -2205,6 +2205,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2278,6 +2279,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux-rel/targets/chromium.gpu.json b/infra/config/generated/builders/try/linux-rel/targets/chromium.gpu.json index e88f0c46..0c9bddd 100644 --- a/infra/config/generated/builders/try/linux-rel/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/linux-rel/targets/chromium.gpu.json
@@ -104,6 +104,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -144,6 +145,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -185,6 +187,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -221,6 +224,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -261,6 +265,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -301,6 +306,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -343,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -379,6 +386,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -416,6 +424,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-rel/targets/chromium.linux.json b/infra/config/generated/builders/try/linux-rel/targets/chromium.linux.json index 1e797811..e081b7c 100644 --- a/infra/config/generated/builders/try/linux-rel/targets/chromium.linux.json +++ b/infra/config/generated/builders/try/linux-rel/targets/chromium.linux.json
@@ -2205,6 +2205,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2278,6 +2279,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux-structured-test-ids-rel-fyi/targets/chromium.fyi.json b/infra/config/generated/builders/try/linux-structured-test-ids-rel-fyi/targets/chromium.fyi.json index 886ea50f..e5a60d4 100644 --- a/infra/config/generated/builders/try/linux-structured-test-ids-rel-fyi/targets/chromium.fyi.json +++ b/infra/config/generated/builders/try/linux-structured-test-ids-rel-fyi/targets/chromium.fyi.json
@@ -2162,6 +2162,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2235,6 +2236,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux-swangle-chromium-try-x64/targets/chromium.swangle.json b/infra/config/generated/builders/try/linux-swangle-chromium-try-x64/targets/chromium.swangle.json index fd9d1c9..147fe3d2 100644 --- a/infra/config/generated/builders/try/linux-swangle-chromium-try-x64/targets/chromium.swangle.json +++ b/infra/config/generated/builders/try/linux-swangle-chromium-try-x64/targets/chromium.swangle.json
@@ -19,6 +19,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/linux-win-cross-rel/targets/chromium.win.json b/infra/config/generated/builders/try/linux-win-cross-rel/targets/chromium.win.json index 778cf17..669e7c5 100644 --- a/infra/config/generated/builders/try/linux-win-cross-rel/targets/chromium.win.json +++ b/infra/config/generated/builders/try/linux-win-cross-rel/targets/chromium.win.json
@@ -2083,6 +2083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/targets/chromium.linux.json b/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/targets/chromium.linux.json index 3a6cd51..67fb36df 100644 --- a/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/targets/chromium.linux.json +++ b/infra/config/generated/builders/try/linux_chromium_compile_dbg_ng/targets/chromium.linux.json
@@ -1659,6 +1659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux_chromium_compile_rel_ng/targets/chromium.linux.json b/infra/config/generated/builders/try/linux_chromium_compile_rel_ng/targets/chromium.linux.json index 5c52db2..8bf3c7b 100644 --- a/infra/config/generated/builders/try/linux_chromium_compile_rel_ng/targets/chromium.linux.json +++ b/infra/config/generated/builders/try/linux_chromium_compile_rel_ng/targets/chromium.linux.json
@@ -2205,6 +2205,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2278,6 +2279,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux_chromium_dbg_ng/targets/chromium.linux.json b/infra/config/generated/builders/try/linux_chromium_dbg_ng/targets/chromium.linux.json index 3a6cd51..67fb36df 100644 --- a/infra/config/generated/builders/try/linux_chromium_dbg_ng/targets/chromium.linux.json +++ b/infra/config/generated/builders/try/linux_chromium_dbg_ng/targets/chromium.linux.json
@@ -1659,6 +1659,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/targets/tryserver.chromium.linux.json b/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/targets/tryserver.chromium.linux.json index 6b49774..4d48a26 100644 --- a/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/targets/tryserver.chromium.linux.json +++ b/infra/config/generated/builders/try/linux_optional_gpu_tests_rel/targets/tryserver.chromium.linux.json
@@ -21,6 +21,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests GTX 1660", "resultdb": { "enable": true, @@ -59,6 +60,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests UHD 630", "resultdb": { "enable": true, @@ -93,6 +95,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test GTX 1660", "resultdb": { "enable": true, @@ -127,6 +130,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test UHD 630", "resultdb": { "enable": true, @@ -161,6 +165,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests GTX 1660", "resultdb": { "enable": true, @@ -195,6 +200,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests UHD 630", "resultdb": { "enable": true, @@ -231,6 +237,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests GTX 1660", "resultdb": { "enable": true, @@ -268,6 +275,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_tests UHD 630", "resultdb": { "enable": true, @@ -304,6 +312,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests GTX 1660", "resultdb": { "enable": true, @@ -340,6 +349,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_tests UHD 630", "resultdb": { "enable": true, @@ -375,6 +385,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests GTX 1660", "resultdb": { "enable": true, @@ -409,6 +420,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests UHD 630", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/mac-angle-chromium-try/targets/chromium.angle.json b/infra/config/generated/builders/try/mac-angle-chromium-try/targets/chromium.angle.json index 9e47db1..aac502f 100644 --- a/infra/config/generated/builders/try/mac-angle-chromium-try/targets/chromium.angle.json +++ b/infra/config/generated/builders/try/mac-angle-chromium-try/targets/chromium.angle.json
@@ -82,6 +82,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -121,6 +122,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -162,6 +164,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -201,6 +204,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -241,6 +245,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -280,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -318,6 +324,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true, @@ -421,6 +428,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -458,6 +466,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -497,6 +506,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -534,6 +544,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -572,6 +583,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests", "resultdb": { "enable": true, @@ -609,6 +621,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -645,6 +658,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/mac-arm64-dawn-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/mac-arm64-dawn-rel/targets/chromium.dawn.json index 065f4b0b..a6ae873 100644 --- a/infra/config/generated/builders/try/mac-arm64-dawn-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/mac-arm64-dawn-rel/targets/chromium.dawn.json
@@ -263,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -372,6 +373,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -413,6 +415,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -454,6 +457,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -494,6 +498,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -536,6 +541,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -648,6 +654,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -692,6 +699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/mac-builder-next/targets/chromium.fyi.json b/infra/config/generated/builders/try/mac-builder-next/targets/chromium.fyi.json index b6ec8cc3..5efef76 100644 --- a/infra/config/generated/builders/try/mac-builder-next/targets/chromium.fyi.json +++ b/infra/config/generated/builders/try/mac-builder-next/targets/chromium.fyi.json
@@ -1559,6 +1559,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac-dawn-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/mac-dawn-rel/targets/chromium.dawn.json index c46f178..5aa6e2f 100644 --- a/infra/config/generated/builders/try/mac-dawn-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/mac-dawn-rel/targets/chromium.dawn.json
@@ -256,6 +256,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -361,6 +362,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -402,6 +404,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -511,6 +514,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -554,6 +558,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true, @@ -819,6 +824,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -918,6 +924,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -957,6 +964,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1060,6 +1068,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1101,6 +1110,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/mac-osxbeta-rel/targets/chromium.fyi.json b/infra/config/generated/builders/try/mac-osxbeta-rel/targets/chromium.fyi.json index 8cab1ef..f0d6011 100644 --- a/infra/config/generated/builders/try/mac-osxbeta-rel/targets/chromium.fyi.json +++ b/infra/config/generated/builders/try/mac-osxbeta-rel/targets/chromium.fyi.json
@@ -1646,6 +1646,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac-rel-cft/targets/chromium.cft.json b/infra/config/generated/builders/try/mac-rel-cft/targets/chromium.cft.json index c9c224f..c0aa48e 100644 --- a/infra/config/generated/builders/try/mac-rel-cft/targets/chromium.cft.json +++ b/infra/config/generated/builders/try/mac-rel-cft/targets/chromium.cft.json
@@ -1753,6 +1753,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac-rel/targets/chromium.gpu.json b/infra/config/generated/builders/try/mac-rel/targets/chromium.gpu.json index d64394d..b7a249ca 100644 --- a/infra/config/generated/builders/try/mac-rel/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/mac-rel/targets/chromium.gpu.json
@@ -134,6 +134,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -176,6 +177,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -219,6 +221,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -257,6 +260,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -299,6 +303,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -341,6 +346,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -385,6 +391,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -423,6 +430,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -463,6 +471,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -629,6 +638,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -673,6 +683,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -718,6 +729,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -758,6 +770,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -802,6 +815,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -846,6 +860,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_graphite_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -892,6 +907,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_graphite_tests", "resultdb": { "enable": true, @@ -932,6 +948,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -974,6 +991,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_graphite_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/mac-rel/targets/chromium.mac.json b/infra/config/generated/builders/try/mac-rel/targets/chromium.mac.json index e445581..f195fe8 100644 --- a/infra/config/generated/builders/try/mac-rel/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac-rel/targets/chromium.mac.json
@@ -1848,6 +1848,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac-swangle-chromium-try-x64/targets/chromium.swangle.json b/infra/config/generated/builders/try/mac-swangle-chromium-try-x64/targets/chromium.swangle.json index 9e7583db..7744214 100644 --- a/infra/config/generated/builders/try/mac-swangle-chromium-try-x64/targets/chromium.swangle.json +++ b/infra/config/generated/builders/try/mac-swangle-chromium-try-x64/targets/chromium.swangle.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/mac12-arm64-rel/targets/chromium.mac.json b/infra/config/generated/builders/try/mac12-arm64-rel/targets/chromium.mac.json index c0db8a81b..33a9ef3e 100644 --- a/infra/config/generated/builders/try/mac12-arm64-rel/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac12-arm64-rel/targets/chromium.mac.json
@@ -1667,6 +1667,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac12-tests/targets/chromium.mac.json b/infra/config/generated/builders/try/mac12-tests/targets/chromium.mac.json index 2f18b2c..16c4306 100644 --- a/infra/config/generated/builders/try/mac12-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac12-tests/targets/chromium.mac.json
@@ -1827,6 +1827,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac13-arm64-rel/targets/chromium.mac.json b/infra/config/generated/builders/try/mac13-arm64-rel/targets/chromium.mac.json index 6790d9c0..60753611 100644 --- a/infra/config/generated/builders/try/mac13-arm64-rel/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac13-arm64-rel/targets/chromium.mac.json
@@ -1755,6 +1755,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac13-tests/targets/chromium.mac.json b/infra/config/generated/builders/try/mac13-tests/targets/chromium.mac.json index 6d12a14a..ae79074 100644 --- a/infra/config/generated/builders/try/mac13-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac13-tests/targets/chromium.mac.json
@@ -1826,6 +1826,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -1901,6 +1902,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac14-arm64-rel/targets/chromium.mac.json b/infra/config/generated/builders/try/mac14-arm64-rel/targets/chromium.mac.json index 9d77dfec..e8bd478 100644 --- a/infra/config/generated/builders/try/mac14-arm64-rel/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac14-arm64-rel/targets/chromium.mac.json
@@ -1811,6 +1811,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac14-tests/targets/chromium.mac.json b/infra/config/generated/builders/try/mac14-tests/targets/chromium.mac.json index ec4ec13..acc3dc56 100644 --- a/infra/config/generated/builders/try/mac14-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac14-tests/targets/chromium.mac.json
@@ -1848,6 +1848,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac15-arm64-rel/targets/chromium.mac.json b/infra/config/generated/builders/try/mac15-arm64-rel/targets/chromium.mac.json index f7333ce..f98cb2a 100644 --- a/infra/config/generated/builders/try/mac15-arm64-rel/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac15-arm64-rel/targets/chromium.mac.json
@@ -2111,6 +2111,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac15-x64-rel-tests/targets/chromium.mac.json b/infra/config/generated/builders/try/mac15-x64-rel-tests/targets/chromium.mac.json index e445581..f195fe8 100644 --- a/infra/config/generated/builders/try/mac15-x64-rel-tests/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac15-x64-rel-tests/targets/chromium.mac.json
@@ -1848,6 +1848,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/targets/chromium.mac.json b/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/targets/chromium.mac.json index 78fc2bb..deb28f70 100644 --- a/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac_chromium_compile_dbg_ng/targets/chromium.mac.json
@@ -1573,6 +1573,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -1594,6 +1595,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac_chromium_compile_rel_ng/targets/chromium.mac.json b/infra/config/generated/builders/try/mac_chromium_compile_rel_ng/targets/chromium.mac.json index 2c2724b6..dd3d46b 100644 --- a/infra/config/generated/builders/try/mac_chromium_compile_rel_ng/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac_chromium_compile_rel_ng/targets/chromium.mac.json
@@ -1827,6 +1827,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -3721,6 +3722,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -3796,6 +3798,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true @@ -5696,6 +5699,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -7612,6 +7616,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac_chromium_dbg_ng/targets/chromium.mac.json b/infra/config/generated/builders/try/mac_chromium_dbg_ng/targets/chromium.mac.json index 78fc2bb..deb28f70 100644 --- a/infra/config/generated/builders/try/mac_chromium_dbg_ng/targets/chromium.mac.json +++ b/infra/config/generated/builders/try/mac_chromium_dbg_ng/targets/chromium.mac.json
@@ -1573,6 +1573,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -1594,6 +1595,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/targets/tryserver.chromium.mac.json b/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/targets/tryserver.chromium.mac.json index b1d71122..ae58356 100644 --- a/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/targets/tryserver.chromium.mac.json +++ b/infra/config/generated/builders/try/mac_optional_gpu_tests_rel/targets/tryserver.chromium.mac.json
@@ -111,6 +111,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -148,6 +149,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_gl_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -183,6 +185,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -220,6 +223,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_metal_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -259,6 +263,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test 1002:7340", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -305,6 +310,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_gl_passthrough_ganesh_test 8086:3e9b", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -349,6 +355,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test 1002:7340", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -395,6 +402,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_metal_passthrough_ganesh_test 8086:3e9b", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -435,6 +443,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests 1002:7340", "resultdb": { "enable": true, @@ -472,6 +481,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests 8086:3e9b", "resultdb": { "enable": true, @@ -507,6 +517,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests 1002:7340", "resultdb": { "enable": true, @@ -544,6 +555,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests 8086:3e9b", "resultdb": { "enable": true, @@ -583,6 +595,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests 1002:7340", "resultdb": { "enable": true, @@ -624,6 +637,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests 8086:3e9b", "resultdb": { "enable": true, @@ -663,6 +677,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test 1002:7340", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -709,6 +724,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_gl_passthrough_ganesh_test 8086:3e9b", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -753,6 +769,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test 1002:7340", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -799,6 +816,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_metal_passthrough_ganesh_test 8086:3e9b", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -840,6 +858,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -878,6 +897,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_gl_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -914,6 +934,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -952,6 +973,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_metal_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -987,6 +1009,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test 1002:7340", "resultdb": { "enable": true, @@ -1024,6 +1047,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test 8086:3e9b", "resultdb": { "enable": true, @@ -1059,6 +1083,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -1096,6 +1121,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_gl_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1131,6 +1157,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -1168,6 +1195,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1203,6 +1231,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests 1002:7340", "resultdb": { "enable": true, @@ -1240,6 +1269,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_metal_passthrough_graphite_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1278,6 +1308,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests 1002:7340", "resultdb": { "enable": true, @@ -1319,6 +1350,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_metal_passthrough_graphite_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1356,6 +1388,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -1395,6 +1428,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_gl_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1433,6 +1467,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -1472,6 +1507,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_metal_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1508,6 +1544,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests 1002:7340", "resultdb": { "enable": true, @@ -1546,6 +1583,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1581,6 +1619,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -1618,6 +1657,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_gl_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1653,6 +1693,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests 1002:7340", "resultdb": { "enable": true, @@ -1690,6 +1731,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_ganesh_tests 8086:3e9b", "resultdb": { "enable": true, @@ -1725,6 +1767,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests 1002:7340", "resultdb": { "enable": true, @@ -1762,6 +1805,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_metal_passthrough_graphite_tests 8086:3e9b", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/win-angle-chromium-x64-try/targets/chromium.angle.json b/infra/config/generated/builders/try/win-angle-chromium-x64-try/targets/chromium.angle.json index f26a9f65..ee80fadc 100644 --- a/infra/config/generated/builders/try/win-angle-chromium-x64-try/targets/chromium.angle.json +++ b/infra/config/generated/builders/try/win-angle-chromium-x64-try/targets/chromium.angle.json
@@ -22,6 +22,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -59,6 +60,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -96,6 +98,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -133,6 +136,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true, @@ -170,6 +174,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests", "resultdb": { "enable": true, @@ -214,6 +219,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -251,6 +257,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -288,6 +295,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true, @@ -325,6 +333,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/win-arm64-compile-dbg/targets/chromium.win.json b/infra/config/generated/builders/try/win-arm64-compile-dbg/targets/chromium.win.json index 34d9046..5517c582 100644 --- a/infra/config/generated/builders/try/win-arm64-compile-dbg/targets/chromium.win.json +++ b/infra/config/generated/builders/try/win-arm64-compile-dbg/targets/chromium.win.json
@@ -1998,6 +1998,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -2021,6 +2022,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/win-arm64-dbg/targets/chromium.win.json b/infra/config/generated/builders/try/win-arm64-dbg/targets/chromium.win.json index 34d9046..5517c582 100644 --- a/infra/config/generated/builders/try/win-arm64-dbg/targets/chromium.win.json +++ b/infra/config/generated/builders/try/win-arm64-dbg/targets/chromium.win.json
@@ -1998,6 +1998,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -2021,6 +2022,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/win-arm64-rel/targets/chromium.win.json b/infra/config/generated/builders/try/win-arm64-rel/targets/chromium.win.json index c138a0aa1..fd58463 100644 --- a/infra/config/generated/builders/try/win-arm64-rel/targets/chromium.win.json +++ b/infra/config/generated/builders/try/win-arm64-rel/targets/chromium.win.json
@@ -2257,6 +2257,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2279,6 +2280,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/win-dawn-rel/targets/chromium.dawn.json b/infra/config/generated/builders/try/win-dawn-rel/targets/chromium.dawn.json index d96718d5..b9fdf9c0 100644 --- a/infra/config/generated/builders/try/win-dawn-rel/targets/chromium.dawn.json +++ b/infra/config/generated/builders/try/win-dawn-rel/targets/chromium.dawn.json
@@ -299,6 +299,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -368,6 +369,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -409,6 +411,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -447,6 +450,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -550,6 +554,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -872,6 +877,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -972,6 +978,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1011,6 +1018,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_tests", "resultdb": { "enable": true, @@ -1052,6 +1060,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_fxc_with_validation_tests", "resultdb": { "enable": true, @@ -1091,6 +1100,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_service_worker_tests", "resultdb": { "enable": true, @@ -1129,6 +1139,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_shared_worker_tests", "resultdb": { "enable": true, @@ -1166,6 +1177,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true, @@ -1205,6 +1217,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_with_validation_tests", "resultdb": { "enable": true, @@ -1308,6 +1321,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_tests", "resultdb": { "enable": true, @@ -1349,6 +1363,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_swiftshader_web_platform_cts_with_validation_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/win-rel-cft/targets/chromium.cft.json b/infra/config/generated/builders/try/win-rel-cft/targets/chromium.cft.json index 7ac3902..e9735b46 100644 --- a/infra/config/generated/builders/try/win-rel-cft/targets/chromium.cft.json +++ b/infra/config/generated/builders/try/win-rel-cft/targets/chromium.cft.json
@@ -2123,6 +2123,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/win-rel/targets/chromium.gpu.json b/infra/config/generated/builders/try/win-rel/targets/chromium.gpu.json index 19fe45b..6ca893a 100644 --- a/infra/config/generated/builders/try/win-rel/targets/chromium.gpu.json +++ b/infra/config/generated/builders/try/win-rel/targets/chromium.gpu.json
@@ -159,6 +159,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_tests", "resultdb": { "enable": true, @@ -201,6 +202,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -244,6 +246,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "gpu_process_launch_tests", "resultdb": { "enable": true, @@ -282,6 +285,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "hardware_accelerated_feature_tests", "resultdb": { "enable": true, @@ -324,6 +328,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests", "resultdb": { "enable": true, @@ -366,6 +371,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_test", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -410,6 +416,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_tests", "resultdb": { "enable": true, @@ -448,6 +455,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test", "resultdb": { "enable": true, @@ -488,6 +496,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/win-rel/targets/chromium.win.json b/infra/config/generated/builders/try/win-rel/targets/chromium.win.json index 92b6da3..e7db2c6b 100644 --- a/infra/config/generated/builders/try/win-rel/targets/chromium.win.json +++ b/infra/config/generated/builders/try/win-rel/targets/chromium.win.json
@@ -2346,6 +2346,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true @@ -2367,6 +2368,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//testing:test_env_py_unittests", + "module_scheme": "single", "name": "test_env_py_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/win-swangle-chromium-try-x86/targets/chromium.swangle.json b/infra/config/generated/builders/try/win-swangle-chromium-try-x86/targets/chromium.swangle.json index 29b4bfa..3df9e96 100644 --- a/infra/config/generated/builders/try/win-swangle-chromium-try-x86/targets/chromium.swangle.json +++ b/infra/config/generated/builders/try/win-swangle-chromium-try-x86/targets/chromium.swangle.json
@@ -18,6 +18,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_swangle_passthrough_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/win10-code-coverage/targets/chromium.coverage.json b/infra/config/generated/builders/try/win10-code-coverage/targets/chromium.coverage.json index 344e10cb..40373615 100644 --- a/infra/config/generated/builders/try/win10-code-coverage/targets/chromium.coverage.json +++ b/infra/config/generated/builders/try/win10-code-coverage/targets/chromium.coverage.json
@@ -1710,6 +1710,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_dedicated_worker_tests", "resultdb": { "enable": true, @@ -1746,6 +1747,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgpu_cts_tests", "resultdb": { "enable": true,
diff --git a/infra/config/generated/builders/try/win10-dbg/targets/chromium.win.json b/infra/config/generated/builders/try/win10-dbg/targets/chromium.win.json index 39ec2c46..eb255b3 100644 --- a/infra/config/generated/builders/try/win10-dbg/targets/chromium.win.json +++ b/infra/config/generated/builders/try/win10-dbg/targets/chromium.win.json
@@ -1779,6 +1779,7 @@ "script": "//tools/perf/process_perf_results.py" }, "module_name": "//chrome/test:performance_test_suite", + "module_scheme": "flat", "name": "performance_test_suite", "resultdb": { "enable": true @@ -1800,6 +1801,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/win11-rel/targets/chromium.win.json b/infra/config/generated/builders/try/win11-rel/targets/chromium.win.json index 458a69a..bc3e5ec 100644 --- a/infra/config/generated/builders/try/win11-rel/targets/chromium.win.json +++ b/infra/config/generated/builders/try/win11-rel/targets/chromium.win.json
@@ -2171,6 +2171,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_unittests", + "module_scheme": "flat", "name": "telemetry_gpu_unittests", "resultdb": { "enable": true
diff --git a/infra/config/generated/builders/try/win_optional_gpu_tests_rel/targets/tryserver.chromium.win.json b/infra/config/generated/builders/try/win_optional_gpu_tests_rel/targets/tryserver.chromium.win.json index 3caff19..d73df4a 100644 --- a/infra/config/generated/builders/try/win_optional_gpu_tests_rel/targets/tryserver.chromium.win.json +++ b/infra/config/generated/builders/try/win_optional_gpu_tests_rel/targets/tryserver.chromium.win.json
@@ -182,6 +182,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "context_lost_passthrough_graphite_tests 10de:2184", "resultdb": { "enable": true, @@ -221,6 +222,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "expected_color_pixel_passthrough_graphite_test 10de:2184", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -265,6 +267,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests 10de:2184", "resultdb": { "enable": true, @@ -304,6 +307,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "info_collection_tests 8086:9bc5", "resultdb": { "enable": true, @@ -374,6 +378,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "pixel_skia_gold_passthrough_graphite_test 10de:2184", "precommit_args": [ "--gerrit-issue=${patch_issue}", @@ -415,6 +420,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "screenshot_sync_passthrough_graphite_tests 10de:2184", "resultdb": { "enable": true, @@ -450,6 +456,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "trace_test 10de:2184", "resultdb": { "enable": true, @@ -485,6 +492,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests 10de:2184", "resultdb": { "enable": true, @@ -520,6 +528,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webcodecs_tests 8086:9bc5", "resultdb": { "enable": true, @@ -558,6 +567,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl2_conformance_d3d11_passthrough_tests 10de:2184", "resultdb": { "enable": true, @@ -595,6 +605,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests 10de:2184", "resultdb": { "enable": true, @@ -632,6 +643,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d11_passthrough_tests 8086:9bc5", "resultdb": { "enable": true, @@ -670,6 +682,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests 10de:2184", "resultdb": { "enable": true, @@ -707,6 +720,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_d3d9_passthrough_tests 8086:9bc5", "resultdb": { "enable": true, @@ -745,6 +759,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webgl_conformance_vulkan_passthrough_tests 8086:9bc5", "resultdb": { "enable": true, @@ -782,6 +797,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests 10de:2184", "resultdb": { "enable": true, @@ -817,6 +833,7 @@ "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, "module_name": "//chrome/test:telemetry_gpu_integration_test", + "module_scheme": "flat", "name": "webrtc_tests 8086:9bc5", "resultdb": { "enable": true,
diff --git a/infra/config/generated/testing/gn_isolate_map.pyl b/infra/config/generated/testing/gn_isolate_map.pyl index c4ac601..5acb383fc 100644 --- a/infra/config/generated/testing/gn_isolate_map.pyl +++ b/infra/config/generated/testing/gn_isolate_map.pyl
@@ -1439,6 +1439,13 @@ "label": "//components/optimization_guide/internal:ondevice_model_benchmark", "type": "additional_compile_target", }, + "ondevice_model_benchmark_tests": { + "label": "//components/optimization_guide/internal/testing:ondevice_model_benchmark_tests", + "type": "generated_script", + "args": [ + "--benchmark_binary_dir=./", + ], + }, "ondevice_stability_tests": { "label": "//components/optimization_guide/internal/testing:ondevice_stability_tests", "type": "generated_script",
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl index 84f6c1af..2b8d0183 100644 --- a/infra/config/generated/testing/test_suites.pyl +++ b/infra/config/generated/testing/test_suites.pyl
@@ -2036,6 +2036,14 @@ 'views_unittests': {}, }, + 'ondevice_model_benchmark_tests_suite': { + 'ondevice_model_benchmark_tests': { + 'mixins': [ + 'has_native_resultdb_integration', + ], + }, + }, + 'ondevice_stability_tests_light_suite': { 'ondevice_stability_tests_light': { 'mixins': [ @@ -2908,6 +2916,7 @@ 'optimization_guide_mac_script_tests': { 'model_validation_tests_light_suite': {}, 'model_validation_tests_suite': {}, + 'ondevice_model_benchmark_tests_suite': {}, 'ondevice_stability_tests_suite': {}, },
diff --git a/infra/config/targets/basic_suites.star b/infra/config/targets/basic_suites.star index 3d0550f3..4662c5a 100644 --- a/infra/config/targets/basic_suites.star +++ b/infra/config/targets/basic_suites.star
@@ -1303,6 +1303,17 @@ ) targets.legacy_basic_suite( + name = "ondevice_model_benchmark_tests_suite", + tests = { + "ondevice_model_benchmark_tests": targets.legacy_test_config( + mixins = [ + "has_native_resultdb_integration", + ], + ), + }, +) + +targets.legacy_basic_suite( name = "opt_target_coverage_test_suite", tests = { "opt_target_coverage_test": targets.legacy_test_config(
diff --git a/infra/config/targets/binaries.star b/infra/config/targets/binaries.star index 47d41ab..2cc840b 100644 --- a/infra/config/targets/binaries.star +++ b/infra/config/targets/binaries.star
@@ -1825,6 +1825,14 @@ ) targets.binaries.generated_script( + name = "ondevice_model_benchmark_tests", + label = "//components/optimization_guide/internal/testing:ondevice_model_benchmark_tests", + args = [ + "--benchmark_binary_dir=./", + ], +) + +targets.binaries.generated_script( name = "opt_target_coverage_test", label = "//components/optimization_guide/internal/testing:opt_target_coverage_test", ) @@ -1950,6 +1958,7 @@ "--smoke-test-mode", ], ), + module_scheme = "flat", ) targets.binaries.generated_script( @@ -2026,6 +2035,7 @@ label = "//build/private_code_test:private_code_failure_test", # All references have been moved to starlark skip_usage_check = True, + module_scheme = "single", ) targets.binaries.console_test_launcher( @@ -2239,11 +2249,13 @@ targets.binaries.generated_script( name = "telemetry_gpu_integration_test", label = "//chrome/test:telemetry_gpu_integration_test", + module_scheme = "flat", ) targets.binaries.generated_script( name = "telemetry_gpu_integration_test_android_chrome", label = "//chrome/test:telemetry_gpu_integration_test_android_chrome", + module_scheme = "flat", ) targets.binaries.script( @@ -2255,6 +2267,7 @@ args = [ "../../content/test/gpu/run_gpu_integration_test.py", ], + module_scheme = "flat", ) targets.binaries.script( @@ -2268,6 +2281,7 @@ "--logs-dir", "${ISOLATED_OUTDIR}", ], + module_scheme = "flat", ) targets.binaries.script( @@ -2281,6 +2295,7 @@ resultdb = targets.resultdb( enable = True, ), + module_scheme = "flat", ) # This isolate is used by @@ -2338,6 +2353,7 @@ resultdb = targets.resultdb( enable = True, ), + module_scheme = "single", ) targets.binaries.console_test_launcher(
diff --git a/infra/config/targets/matrix_compound_suites.star b/infra/config/targets/matrix_compound_suites.star index 8606f3de..d60d4ed 100644 --- a/infra/config/targets/matrix_compound_suites.star +++ b/infra/config/targets/matrix_compound_suites.star
@@ -574,6 +574,7 @@ "model_validation_tests_suite": None, "model_validation_tests_light_suite": None, "ondevice_stability_tests_suite": None, + "ondevice_model_benchmark_tests_suite": None, }, )
diff --git a/infra/config/targets/tests.star b/infra/config/targets/tests.star index afbe730..fe151fc0 100644 --- a/infra/config/targets/tests.star +++ b/infra/config/targets/tests.star
@@ -1971,6 +1971,10 @@ ) targets.tests.isolated_script_test( + name = "ondevice_model_benchmark_tests", +) + +targets.tests.isolated_script_test( name = "opt_target_coverage_test", )
diff --git a/internal b/internal index fc69bb9..9044ebb 160000 --- a/internal +++ b/internal
@@ -1 +1 @@ -Subproject commit fc69bb93413a049c3f467b975ffe3ee8882d0f4e +Subproject commit 9044ebbb524768005838a1dc2a8b0e7114e575eb
diff --git a/ios/chrome/browser/passwords/model/password_controller_unittest.mm b/ios/chrome/browser/passwords/model/password_controller_unittest.mm index 5674ecc..be4c1a03 100644 --- a/ios/chrome/browser/passwords/model/password_controller_unittest.mm +++ b/ios/chrome/browser/passwords/model/password_controller_unittest.mm
@@ -437,8 +437,10 @@ EXPECT_TRUE(WaitUntilConditionOrTimeout(kWaitForActionTimeout, ^bool() { return block_was_called; })); - ASSERT_TRUE( - passwordController_.sharedPasswordController.isPasswordGenerated); + + EXPECT_TRUE(WaitUntilConditionOrTimeout(kWaitForActionTimeout, ^bool() { + return passwordController_.sharedPasswordController.isPasswordGenerated; + })); } void LoadHtml(NSString* html) {
diff --git a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/grid/regular/regular_grid_mediator_unittest.mm b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/grid/regular/regular_grid_mediator_unittest.mm index cfdc140..56fceac 100644 --- a/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/grid/regular/regular_grid_mediator_unittest.mm +++ b/ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/grid/regular/regular_grid_mediator_unittest.mm
@@ -38,6 +38,7 @@ #import "ios/chrome/browser/tab_switcher/ui_bundled/test/fake_tab_collection_consumer.h" #import "ios/web/public/test/fakes/fake_web_state.h" +using collaboration::messaging::PersistentNotificationType; using testing::_; using testing::Return; @@ -305,8 +306,7 @@ std::make_optional(collaboration::messaging::TabMessageMetadata()); message.attribution.tab_group_metadata = std::make_optional(metadata); metadata.local_tab_group_id = std::make_optional(tab_group_id); - message.type = - collaboration::messaging::PersistentNotificationType::DIRTY_TAB; + message.type = PersistentNotificationType::DIRTY_TAB; message.collaboration_event = collaboration::messaging::CollaborationEvent::TAB_UPDATED; @@ -316,12 +316,9 @@ EXPECT_EQ(nil, [mediator_ activityLabelDataForGroup:tab_group_id]); ON_CALL(messaging_backend_, IsInitialized).WillByDefault(Return(true)); - ON_CALL( - messaging_backend_, - GetMessagesForGroup( - tab_groups::EitherGroupID(tab_group_id), - std::make_optional( - collaboration::messaging::PersistentNotificationType::DIRTY_TAB))) + ON_CALL(messaging_backend_, + GetMessagesForGroup(tab_groups::EitherGroupID(tab_group_id), + PersistentNotificationType::DIRTY_TAB)) .WillByDefault(Return(std::vector{message})); // Fake the initialization of the service. @@ -338,12 +335,9 @@ activityLabelDataForGroup:tab_groups::TabGroupId::GenerateNew()]); // Simulate the tab message being removed. - ON_CALL( - messaging_backend_, - GetMessagesForGroup( - tab_groups::EitherGroupID(tab_group_id), - std::make_optional( - collaboration::messaging::PersistentNotificationType::DIRTY_TAB))) + ON_CALL(messaging_backend_, + GetMessagesForGroup(tab_groups::EitherGroupID(tab_group_id), + PersistentNotificationType::DIRTY_TAB)) .WillByDefault( Return(std::vector<collaboration::messaging::PersistentMessage>{})); // Fake the update of the service. @@ -371,8 +365,7 @@ collaboration::messaging::PersistentMessage message; collaboration::messaging::TabGroupMessageMetadata metadata; metadata.local_tab_group_id = std::make_optional(tab_group_id); - message.type = - collaboration::messaging::PersistentNotificationType::DIRTY_TAB_GROUP; + message.type = PersistentNotificationType::DIRTY_TAB_GROUP; message.attribution.tab_group_metadata = std::make_optional(metadata); // The activity label data should be nil by default. @@ -423,8 +416,7 @@ std::make_optional(collaboration::messaging::TabMessageMetadata()); message.attribution.tab_group_metadata = std::make_optional(metadata); metadata.local_tab_group_id = std::make_optional(tab_group_id); - message.type = - collaboration::messaging::PersistentNotificationType::TOMBSTONED; + message.type = PersistentNotificationType::TOMBSTONED; message.collaboration_event = collaboration::messaging::CollaborationEvent::TAB_REMOVED; @@ -432,10 +424,8 @@ EXPECT_EQ(nil, [mediator_ activityLabelDataForGroup:tab_group_id]); ON_CALL(messaging_backend_, - GetMessagesForGroup( - tab_groups::EitherGroupID(tab_group_id), - std::make_optional(collaboration::messaging:: - PersistentNotificationType::TOMBSTONED))) + GetMessagesForGroup(tab_groups::EitherGroupID(tab_group_id), + PersistentNotificationType::TOMBSTONED)) .WillByDefault(Return(std::vector{message})); // Fake the update of the service.
diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn index ab0b9d14..e150aa2 100644 --- a/media/capture/BUILD.gn +++ b/media/capture/BUILD.gn
@@ -6,7 +6,6 @@ import("//build/config/features.gni") import("//build/config/ui.gni") import("//media/media_options.gni") -import("//services/video_effects/args.gni") import("//testing/test.gni") import("//third_party/webrtc/webrtc.gni") @@ -161,19 +160,11 @@ "//media/mojo/mojom", "//services/service_manager/public/cpp", "//services/video_capture/public/mojom", - "//services/video_effects/buildflags", "//third_party/libyuv", "//ui/display", "//ui/gfx", ] - if (enable_video_effects) { - sources += [ - "video/video_capture_effects_processor.cc", - "video/video_capture_effects_processor.h", - ] - } - if (is_android) { public_deps += [ "video/android" ] deps += [ "video/android:capture_jni_headers" ] @@ -481,10 +472,6 @@ "video_capture_types_unittest.cc", ] - if (enable_video_effects) { - sources += [ "video/video_capture_effects_processor_unittest.cc" ] - } - data = [ "//media/test/data/bear.mjpeg" ] deps = [ @@ -499,20 +486,12 @@ "//media/capture/mojom:image_capture_types", "//mojo/core/embedder", "//services/video_capture/public/mojom", - "//services/video_effects/buildflags", "//testing/gmock", "//testing/gtest", "//third_party/libyuv", "//ui/gfx:test_support", ] - if (enable_video_effects) { - deps += [ - "//components/viz/test:test_support", - "//services/video_effects/test:test_support", - ] - } - if (is_linux) { sources += [ "video/linux/v4l2_capture_delegate_unittest.cc",
diff --git a/media/capture/video/DEPS b/media/capture/video/DEPS index b8428df..fb1735c 100644 --- a/media/capture/video/DEPS +++ b/media/capture/video/DEPS
@@ -3,20 +3,10 @@ "+chromeos/dbus", "+components/device_event_log", "+mojo/public/cpp", - # This dependency is safe because it's a leaf in the video_effects_service, - # but //media shouldn't depend on anything else from services/video_effects. - "+services/video_effects/public/mojom", - "+services/video_effects/public/cpp/buildflags.h", "+third_party/libyuv", ] specific_include_rules = { - "video_capture_device_client_unittest\.cc": [ - "+services/video_effects/test", - ], - "video_capture_effects_processor_unittest\.cc": [ - "+components/viz/test", - ], "video_capture_device_client_unittest.cc": [ "+components/viz/test/test_context_provider.h", ],
diff --git a/media/capture/video/video_capture_buffer_pool_util.cc b/media/capture/video/video_capture_buffer_pool_util.cc index 3abc785..66fa697e 100644 --- a/media/capture/video/video_capture_buffer_pool_util.cc +++ b/media/capture/video/video_capture_buffer_pool_util.cc
@@ -7,7 +7,6 @@ #include "build/build_config.h" #include "media/base/media_switches.h" #include "media/capture/capture_switches.h" -#include "services/video_effects/public/cpp/buildflags.h" namespace media { @@ -45,17 +44,6 @@ } #endif -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - if (base::FeatureList::IsEnabled(media::kCameraMicEffects)) { - // We may need 2x as many buffers if video effects are going to be applied - // to account for the fact that each captured video frame will have - // additional buffer allocated for post-processing result. - // TODO(crbug.com//375229156): Make pool size dependant on whether there is - // an effects processor in use. - max_buffer_count = max_buffer_count * 2; - } -#endif - return max_buffer_count; }
diff --git a/media/capture/video/video_capture_device_client.cc b/media/capture/video/video_capture_device_client.cc index dfa8738..a105b1d 100644 --- a/media/capture/video/video_capture_device_client.cc +++ b/media/capture/video/video_capture_device_client.cc
@@ -40,7 +40,6 @@ #include "media/capture/video/video_capture_buffer_pool.h" #include "media/capture/video/video_frame_receiver.h" #include "media/capture/video_capture_types.h" -#include "services/video_effects/public/mojom/video_effects_processor.mojom.h" #include "third_party/abseil-cpp/absl/cleanup/cleanup.h" #include "third_party/libyuv/include/libyuv.h" @@ -48,11 +47,6 @@ #include "media/capture/video/chromeos/video_capture_jpeg_decoder.h" #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) -#include "media/base/media_switches.h" -#include "media/capture/video/video_capture_effects_processor.h" -#endif // BUILDFLAG(ENABLE_VIDEO_EFFECTS) - namespace { bool IsFormatSupported(media::VideoPixelFormat pixel_format) { @@ -295,36 +289,6 @@ const int buffer_id_; }; -VideoEffectsContext::VideoEffectsContext() = default; - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) -VideoEffectsContext::VideoEffectsContext( - mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor> - processor_remote, - mojo::PendingRemote<media::mojom::ReadonlyVideoEffectsManager> - readonly_manager_remote) - : video_effects_processor_(std::move(processor_remote)), - readonly_video_effects_manager_(std::move(readonly_manager_remote)) {} -#endif - -VideoEffectsContext::VideoEffectsContext(VideoEffectsContext&& other) = default; -VideoEffectsContext& VideoEffectsContext::operator=( - VideoEffectsContext&& other) = default; - -VideoEffectsContext::~VideoEffectsContext() = default; - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) -mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor>&& -VideoEffectsContext::TakeVideoEffectsProcessor() { - return std::move(video_effects_processor_); -} - -mojo::PendingRemote<media::mojom::ReadonlyVideoEffectsManager>&& -VideoEffectsContext::TakeReadonlyVideoEffectsManager() { - return std::move(readonly_video_effects_manager_); -} -#endif - #if BUILDFLAG(IS_CHROMEOS) VideoCaptureDeviceClient::VideoCaptureDeviceClient( std::unique_ptr<VideoFrameReceiver> receiver, @@ -342,29 +306,10 @@ #else VideoCaptureDeviceClient::VideoCaptureDeviceClient( std::unique_ptr<VideoFrameReceiver> receiver, - scoped_refptr<VideoCaptureBufferPool> buffer_pool, - std::optional<VideoEffectsContext> video_effects_context) + scoped_refptr<VideoCaptureBufferPool> buffer_pool) : receiver_(std::move(receiver)), buffer_pool_(std::move(buffer_pool)), - last_captured_pixel_format_(PIXEL_FORMAT_UNKNOWN) { -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - if (base::FeatureList::IsEnabled(media::kCameraMicEffects) && - video_effects_context) { - effects_processor_task_runner_ = - base::SequencedTaskRunner::GetCurrentDefault(); - effects_processor_ = std::make_unique<VideoCaptureEffectsProcessor>( - video_effects_context->TakeVideoEffectsProcessor()); - - auto pending_readonly_effects_manager_remote = - video_effects_context->TakeReadonlyVideoEffectsManager(); - CHECK(pending_readonly_effects_manager_remote); - readonly_effects_manager_remote_.Bind( - std::move(pending_readonly_effects_manager_remote)); - readonly_effects_manager_remote_->AddObserver( - effects_configuration_observer_.BindNewPipeAndPassRemote()); - } -#endif // BUILDFLAG(ENABLE_VIDEO_EFFECTS) -} + last_captured_pixel_format_(PIXEL_FORMAT_UNKNOWN) {} #endif // BUILDFLAG(IS_CHROMEOS) VideoCaptureDeviceClient::~VideoCaptureDeviceClient() { @@ -374,13 +319,6 @@ receiver_->OnBufferRetired(buffer_id); } receiver_->OnStopped(); - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - if (effects_processor_) { - effects_processor_task_runner_->DeleteSoon(FROM_HERE, - std::move(effects_processor_)); - } -#endif } // static @@ -401,90 +339,6 @@ receiver_->OnCaptureConfigurationChanged(); } -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) -void VideoCaptureDeviceClient::OnConfigurationChanged( - media::mojom::VideoEffectsConfigurationPtr configuration) { - if (configuration.is_null()) { - has_active_effects_ = false; - } else if (configuration->blur.is_null() && - configuration->framing.is_null() && - configuration->image_enhancement.is_null()) { - has_active_effects_ = false; - } else { - has_active_effects_ = true; - } -} - -bool VideoCaptureDeviceClient::ShouldApplyVideoEffects() const { - return base::FeatureList::IsEnabled(media::kCameraMicEffects) && - effects_processor_ && has_active_effects_; -} - -std::optional<VideoCaptureDevice::Client::Buffer> -VideoCaptureDeviceClient::ReserveEffectsOutputBuffer( - const VideoCaptureFormat& format, - const int frame_feedback_id) { - CHECK(base::FeatureList::IsEnabled(media::kCameraMicEffects)); - // We need to allocate the output buffer since the post-processor cannot - // operate in-place. This new `out_buffer`, along with original `buffer`, - // will be considered as held for producer until the post-processor has - // finished processing their contents, after which the `buffer` should be - // marked as unused (`RelinquishProducerReservation()`) and `out_buffer` - // will be marked as held for consumer. - // Note that this means we're allocating 2x as many buffers as we'd have - // allocated without the video effects. It may be possible to hold on to - // the input buffer for less time than what is needed to post-process it - // - it could be released once the processor has imported it into the - // graphical API it uses to run the post-processing logic. - // TODO(https://crbug.com/339141106): Consider having an additional pool - // for post-processing output buffers, separate from the pool used to - // allocate the original buffers. - Buffer out_buffer; - const VideoCaptureDevice::Client::ReserveResult reserve_result = - ReserveOutputBuffer(format.frame_size, format.pixel_format, - frame_feedback_id, &out_buffer, - /*require_new_buffer_id=*/nullptr, - /*retire_old_buffer_id=*/nullptr); - - if (reserve_result == VideoCaptureDevice::Client::ReserveResult::kSucceeded) { - return std::move(out_buffer); - } else { - // We weren't able to reserve the buffer for the post-processor's - // result. We could either drop the frame or deliver the unprocessed - // buffer to the consumer, but since post-processing can apply - // privacy-preserving effects, we should not deliver unprocessed frames - // without user intervention, hence we report failure. - receiver_->OnFrameDropped( - ConvertReservationFailureToFrameDropReason(reserve_result)); - return std::nullopt; - } -} - -void VideoCaptureDeviceClient::OnPostProcessDone( - base::expected<PostProcessDoneInfo, video_effects::mojom::PostProcessError> - post_process_info_or_error) { - if (!post_process_info_or_error.has_value()) { - // On post-process failure, report that a frame was dropped. We cannot - // fall back to the unprocessed frame because some privacy-preserving - // effect could have been applied. The decision to disable misbehaving - // effects must be made by the user. - receiver_->OnFrameDropped( - VideoCaptureFrameDropReason::kPostProcessingFailed); - return; - } - - Buffer buffer = std::move(post_process_info_or_error->buffer); - mojom::VideoFrameInfoPtr info = std::move(post_process_info_or_error->info); - - buffer_pool_->HoldForConsumers(buffer.id, 1); - receiver_->OnFrameReadyInBuffer(ReadyFrameInBuffer( - buffer.id, buffer.frame_feedback_id, - std::make_unique<ScopedBufferPoolReservation<ConsumerReleaseTraits>>( - buffer_pool_, buffer.id), - std::move(info))); -} -#endif - void VideoCaptureDeviceClient::OnIncomingCapturedData( const uint8_t* data, int length, @@ -562,54 +416,6 @@ return; } -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - if (ShouldApplyVideoEffects()) { - auto data_span = base::span(data, base::checked_cast<size_t>(length)); - - mojom::VideoFrameInfoPtr info = CreateNewVideoFrameInfo( - reference_time, timestamp, capture_begin_timestamp, format, metadata, - gfx::Rect(format.frame_size), buffer.is_premapped, data_color_space); - - // Must happen here since we move out of `buffer` in the call below: - const VideoCaptureBufferType buffer_type = - buffer_pool_->GetBufferType(buffer.id); - - auto in_buffer_mapped_region = - base::ReadOnlySharedMemoryRegion::Create(data_span.size()); - if (!in_buffer_mapped_region.IsValid()) { - receiver_->OnFrameDropped( - VideoCaptureFrameDropReason::kPostProcessingFailed); - return; - } - - in_buffer_mapped_region.mapping.GetMemoryAsSpan<uint8_t>().copy_from( - data_span); - - // The `buffer` was already reserved above but has not yet been reported as - // ready to the `receiver_`. Once the post-processor has completed, we will - // call `OnPostProcessDone()` & thus notify the receiver from there. - auto post_process_data = base::BindOnce( - &VideoCaptureEffectsProcessor::PostProcessData, - effects_processor_->GetWeakPtr(), - std::move(in_buffer_mapped_region.region), std::move(info), - std::move(buffer), - VideoCaptureFormat(format.frame_size, format.frame_rate, - VideoPixelFormat::PIXEL_FORMAT_I420), - buffer_type, - base::BindOnce(&VideoCaptureDeviceClient::OnPostProcessDone, - weak_ptr_factory_.GetWeakPtr())); - - if (!effects_processor_task_runner_->RunsTasksInCurrentSequence()) { - effects_processor_task_runner_->PostTask(FROM_HERE, - std::move(post_process_data)); - return; - } - - std::move(post_process_data).Run(); - return; - } -#endif - const auto [fourcc_format, flip] = GetFourccAndFlipFromPixelFormat(format, flip_y); @@ -765,52 +571,6 @@ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("video_and_image_capture"), "VideoCaptureDeviceClient::OnIncomingCapturedExternalBuffer"); -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - // TODO(https://crbug.com/377955425): Add unittests for enabled - // media::kCameraMicEffects flag. - - if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && - ShouldApplyVideoEffects()) { - mojom::VideoFrameInfoPtr info = CreateNewVideoFrameInfo( - reference_time, timestamp, capture_begin_timestamp, buffer.format, - metadata, visible_rect, /*is_premapped=*/false, buffer.color_space); - - const auto format = buffer.format; - auto out_buffer_optional = - ReserveEffectsOutputBuffer(format, /*frame_feedback_id=*/0); - if (!out_buffer_optional) { - return; - } - Buffer out_buffer = std::move(out_buffer_optional).value(); - - // Must happen here since we move out of `out_buffer` in the call to - // post-processor: - const VideoCaptureBufferType out_buffer_type = - buffer_pool_->GetBufferType(out_buffer.id); - - // The buffers were reserved but has not yet been reported as ready to the - // `receiver_`. Once the post-processor has completed, we will call - // `OnPostProcessDone()` & thus notify the receiver from there. - - // TODO(https://crbug.com/345688428): drop the frame if we're already - // waiting for processing to finish for too many. Maybe if pool - // utilization is approaching 70%? - auto post_process_data = base::BindOnce( - &VideoCaptureEffectsProcessor::PostProcessExternalBuffer, - effects_processor_->GetWeakPtr(), std::move(buffer), std::move(info), - std::move(out_buffer), format, out_buffer_type, - base::BindOnce(&VideoCaptureDeviceClient::OnPostProcessDone, - weak_ptr_factory_.GetWeakPtr())); - if (effects_processor_task_runner_->RunsTasksInCurrentSequence()) { - std::move(post_process_data).Run(); - } else { - effects_processor_task_runner_->PostTask(FROM_HERE, - std::move(post_process_data)); - } - return; - } -#endif - ReadyFrameInBuffer ready_frame; if (CreateReadyFrameFromExternalBuffer( std::move(buffer), reference_time, timestamp, capture_begin_timestamp, @@ -1005,39 +765,6 @@ reference_time, timestamp, capture_begin_timestamp, format, metadata, visible_rect, buffer.is_premapped, color_space); -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - if (ShouldApplyVideoEffects()) { - auto out_buffer_optional = - ReserveEffectsOutputBuffer(format, /*frame_feedback_id=*/0); - if (!out_buffer_optional) { - return; - } - Buffer out_buffer = std::move(out_buffer_optional).value(); - - // Must happen here since we move out of `buffer` & `out_buffer` in the - // call to post-processor: - const VideoCaptureBufferType in_buffer_type = - buffer_pool_->GetBufferType(buffer.id); - - const VideoCaptureBufferType out_buffer_type = - buffer_pool_->GetBufferType(out_buffer.id); - - // The buffers were reserved but has not yet been reported as ready to the - // `receiver_`. Once the post-processor has completed, we will call - // `OnPostProcessDone()` & thus notify the receiver from there. - - // TODO(https://crbug.com/345688428): drop the frame if we're already - // waiting for processing to finish for too many. Maybe if pool - // utilization is approaching 70%? - effects_processor_->PostProcessBuffer( - std::move(buffer), std::move(info), in_buffer_type, - std::move(out_buffer), format, out_buffer_type, - base::BindOnce(&VideoCaptureDeviceClient::OnPostProcessDone, - weak_ptr_factory_.GetWeakPtr())); - return; - } -#endif - buffer_pool_->HoldForConsumers(buffer.id, 1); receiver_->OnFrameReadyInBuffer(ReadyFrameInBuffer( buffer.id, buffer.frame_feedback_id,
diff --git a/media/capture/video/video_capture_device_client.h b/media/capture/video/video_capture_device_client.h index 01ff4b10..48baa81 100644 --- a/media/capture/video/video_capture_device_client.h +++ b/media/capture/video/video_capture_device_client.h
@@ -18,17 +18,10 @@ #include "base/threading/thread_collision_warner.h" #include "build/build_config.h" #include "media/capture/capture_export.h" -#include "media/capture/mojom/video_effects_manager.mojom.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video/video_frame_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" -#include "services/video_effects/public/cpp/buildflags.h" - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) -#include "media/capture/video/video_capture_effects_processor.h" -#include "services/video_effects/public/mojom/video_effects_processor.mojom-forward.h" -#endif // BUILDFLAG(ENABLE_VIDEO_EFFECTS) namespace gpu { class ClientSharedImage; @@ -46,46 +39,6 @@ CAPTURE_EXPORT BASE_DECLARE_FEATURE(kFallbackToSharedMemoryIfNotNv12OnMac); #endif -// Structure used to inject dependencies required for the -// `VideoCaptureDeviceClient` to apply video effects. -class CAPTURE_EXPORT VideoEffectsContext { - public: - VideoEffectsContext(); - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - explicit VideoEffectsContext( - mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor> - processor_remote, - mojo::PendingRemote<media::mojom::ReadonlyVideoEffectsManager> - readonly_manager_remote); -#endif - - ~VideoEffectsContext(); - - VideoEffectsContext(const VideoEffectsContext& other) = delete; - VideoEffectsContext& operator=(VideoEffectsContext& other) = delete; - - VideoEffectsContext(VideoEffectsContext&& other); - VideoEffectsContext& operator=(VideoEffectsContext&& other); - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor>&& - TakeVideoEffectsProcessor(); - - mojo::PendingRemote<media::mojom::ReadonlyVideoEffectsManager>&& - TakeReadonlyVideoEffectsManager(); -#endif - - private: -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor> - video_effects_processor_; - - mojo::PendingRemote<media::mojom::ReadonlyVideoEffectsManager> - readonly_video_effects_manager_; -#endif -}; - // Implementation of VideoCaptureDevice::Client that uses a buffer pool // to provide buffers and converts incoming data to the I420 format for // consumption by a given VideoFrameReceiver. If @@ -100,11 +53,8 @@ // v4l2_thread on Linux, and the UI thread for tab capture. // The owner is responsible for making sure that the instance outlives these // calls. -class CAPTURE_EXPORT VideoCaptureDeviceClient : -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - public media::mojom::VideoEffectsConfigurationObserver, -#endif - public VideoCaptureDevice::Client { +class CAPTURE_EXPORT VideoCaptureDeviceClient + : public VideoCaptureDevice::Client { public: #if BUILDFLAG(IS_CHROMEOS) VideoCaptureDeviceClient( @@ -112,10 +62,8 @@ scoped_refptr<VideoCaptureBufferPool> buffer_pool, VideoCaptureJpegDecoderFactoryCB jpeg_decoder_factory_callback); #else - VideoCaptureDeviceClient( - std::unique_ptr<VideoFrameReceiver> receiver, - scoped_refptr<VideoCaptureBufferPool> buffer_pool, - std::optional<VideoEffectsContext> video_effects_context); + VideoCaptureDeviceClient(std::unique_ptr<VideoFrameReceiver> receiver, + scoped_refptr<VideoCaptureBufferPool> buffer_pool); #endif // BUILDFLAG(IS_CHROMEOS) VideoCaptureDeviceClient(const VideoCaptureDeviceClient&) = delete; @@ -209,22 +157,6 @@ const std::optional<VideoFrameMetadata>& metadata, int frame_feedback_id); -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - // media::mojom::VideoEffectsConfigurationObserver impl. - void OnConfigurationChanged( - media::mojom::VideoEffectsConfigurationPtr configuration) override; - - bool ShouldApplyVideoEffects() const; - - std::optional<VideoCaptureDevice::Client::Buffer> ReserveEffectsOutputBuffer( - const VideoCaptureFormat& format, - const int frame_feedback_id); - - void OnPostProcessDone(base::expected<PostProcessDoneInfo, - video_effects::mojom::PostProcessError> - post_process_info_or_error); -#endif - // The receiver to which we post events. const std::unique_ptr<VideoFrameReceiver> receiver_; std::vector<int> buffer_ids_known_by_receiver_; @@ -240,25 +172,10 @@ VideoPixelFormat last_captured_pixel_format_; -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - bool has_active_effects_ = false; - scoped_refptr<base::SequencedTaskRunner> effects_processor_task_runner_; - std::unique_ptr<VideoCaptureEffectsProcessor> effects_processor_; - mojo::Remote<media::mojom::ReadonlyVideoEffectsManager> - readonly_effects_manager_remote_; - mojo::Receiver<media::mojom::VideoEffectsConfigurationObserver> - effects_configuration_observer_{this}; -#endif // !BUILDFLAG(ENABLE_VIDEO_EFFECTS) - // Thread collision warner to ensure that producer-facing API is not called // concurrently. Producers are allowed to call from multiple threads, but not // concurrently. DFAKE_MUTEX(call_from_producer_); - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - // Must be last: - base::WeakPtrFactory<VideoCaptureDeviceClient> weak_ptr_factory_{this}; -#endif }; } // namespace media
diff --git a/media/capture/video/video_capture_device_client_unittest.cc b/media/capture/video/video_capture_device_client_unittest.cc index 5d18873..5db5f5d 100644 --- a/media/capture/video/video_capture_device_client_unittest.cc +++ b/media/capture/video/video_capture_device_client_unittest.cc
@@ -24,7 +24,6 @@ #include "media/base/video_frame.h" #include "media/base/video_types.h" #include "media/capture/mojom/video_capture_buffer.mojom.h" -#include "media/capture/mojom/video_effects_manager.mojom.h" #include "media/capture/video/mock_video_frame_receiver.h" #include "media/capture/video/video_capture_buffer_pool_impl.h" #include "media/capture/video/video_capture_buffer_tracker.h" @@ -32,15 +31,9 @@ #include "media/capture/video/video_capture_buffer_tracker_factory_impl.h" #include "media/capture/video/video_frame_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" -#include "services/video_effects/public/cpp/buildflags.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) -#include "services/video_effects/public/mojom/video_effects_processor.mojom.h" -#include "services/video_effects/test/fake_video_effects_processor.h" -#endif - #if BUILDFLAG(IS_CHROMEOS) #include "media/capture/video/chromeos/video_capture_jpeg_decoder.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -70,14 +63,6 @@ } #endif // BUILDFLAG(IS_CHROMEOS) -class FakeVideoEffectsManagerImpl - : public media::mojom::ReadonlyVideoEffectsManager { - void GetConfiguration(GetConfigurationCallback callback) override {} - void AddObserver( - ::mojo::PendingRemote<media::mojom::VideoEffectsConfigurationObserver> - observer) override {} -}; - class FakeVideoCaptureBufferHandle : public VideoCaptureBufferHandle { public: size_t mapped_size() const override { return 1024; } @@ -161,31 +146,11 @@ void Cleanup() { receiver_ = nullptr; device_client_.reset(); - processor_readonly_manager_receiver_.reset(); - - // VideoCaptureDeviceClient's dtor submits a task to destroy its effects - // processor. In order to avoid LSAN warnings, we need to wait for that task - // to run - let's just post a task to the same sequence and run the loop - // until our task fires. - base::RunLoop().RunUntilIdle(); } protected: base::test::TaskEnvironment task_environment_; scoped_refptr<gpu::TestSharedImageInterface> test_sii_; -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - // Will be nullopt until `Init()` has been called: - std::optional<video_effects::FakeVideoEffectsProcessor> - fake_video_effects_processor_; -#endif - FakeVideoEffectsManagerImpl fake_video_effects_manager_; - - mojo::Receiver<media::mojom::ReadonlyVideoEffectsManager> - processor_readonly_manager_receiver_{&fake_video_effects_manager_}; - - mojo::Receiver<media::mojom::ReadonlyVideoEffectsManager> - readonly_video_effects_manager_receiver_{&fake_video_effects_manager_}; - // Must outlive `receiver_`. std::unique_ptr<VideoCaptureDeviceClient> device_client_; raw_ptr<NiceMock<MockVideoFrameReceiver>> receiver_; @@ -201,32 +166,8 @@ std::move(controller), buffer_pool, base::BindRepeating(&ReturnNullPtrAsJpecDecoder)); #else - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - mojo::PendingReceiver<video_effects::mojom::VideoEffectsProcessor> - processor_receiver; - mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor> - processor_remote(processor_receiver.InitWithNewPipeAndPassRemote()); - - mojo::PendingRemote<mojom::ReadonlyVideoEffectsManager> manager_remote = - processor_readonly_manager_receiver_.BindNewPipeAndPassRemote(); - - fake_video_effects_processor_.emplace(std::move(processor_receiver), - std::move(manager_remote)); -#endif - - mojo::PendingRemote<media::mojom::ReadonlyVideoEffectsManager> - readonly_effects_manager_remote = - readonly_video_effects_manager_receiver_.BindNewPipeAndPassRemote(); - device_client_ = std::make_unique<VideoCaptureDeviceClient>( - std::move(controller), buffer_pool, - media::VideoEffectsContext( -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - std::move(processor_remote), - std::move(readonly_effects_manager_remote) -#endif - )); + std::move(controller), buffer_pool); #endif // BUILDFLAG(IS_CHROMEOS) } }; @@ -613,18 +554,4 @@ Cleanup(); } -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) -// Tests that the VideoEffectsManager remote is closed on the correct task -// runner. Destruction on the wrong task runner will cause a crash. -TEST_F(VideoCaptureDeviceClientTest, DestructionClosesVideoEffectsManager) { - InitWithSharedMemoryBufferPool(); - base::RunLoop run_loop; - processor_readonly_manager_receiver_.set_disconnect_handler( - run_loop.QuitClosure()); - receiver_ = nullptr; - EXPECT_NO_FATAL_FAILURE(device_client_.reset()); - run_loop.Run(); -} -#endif // !BUILDFLAG(ENABLE_VIDEO_EFFECTS) - } // namespace media
diff --git a/media/capture/video/video_capture_effects_processor.cc b/media/capture/video/video_capture_effects_processor.cc deleted file mode 100644 index c64032d5..0000000 --- a/media/capture/video/video_capture_effects_processor.cc +++ /dev/null
@@ -1,257 +0,0 @@ -// Copyright 2024 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "media/capture/video/video_capture_effects_processor.h" - -#include <optional> - -#include "base/containers/span.h" -#include "base/functional/callback_helpers.h" -#include "base/memory/scoped_refptr.h" -#include "base/sequence_checker.h" -#include "base/trace_event/trace_event.h" -#include "base/types/expected.h" -#include "components/viz/common/resources/shared_image_format.h" -#include "gpu/command_buffer/client/client_shared_image.h" -#include "gpu/command_buffer/client/shared_image_interface.h" -#include "gpu/command_buffer/common/shared_image_usage.h" -#include "gpu/command_buffer/common/sync_token.h" -#include "media/base/video_types.h" -#include "media/capture/video/video_capture_gpu_channel_host.h" -#include "third_party/perfetto/include/perfetto/tracing/track.h" -#include "ui/gl/gl_bindings.h" - -namespace media { -namespace { - -// Helper, creates VideoBufferHandle for GPU memory buffer by populating -// `shared_image`. This is needed to ensure that the caller can maintain -// ownership of the shared image while it's in use. -mojom::VideoBufferHandlePtr CreateGpuMemoryBufferHandle( - gfx::GpuMemoryBufferHandle buffer_handle, - const mojom::VideoFrameInfo& frame_info, - scoped_refptr<gpu::ClientSharedImage>& shared_image) { - CHECK_EQ(frame_info.pixel_format, VideoPixelFormat::PIXEL_FORMAT_NV12); - - auto sii = - VideoCaptureGpuChannelHost::GetInstance().GetSharedImageInterface(); - CHECK(sii); - - // Create a single shared image to back a multiplanar video frame. - gpu::SharedImageInfo info( - viz::MultiPlaneFormat::kNV12, frame_info.coded_size, - frame_info.color_space, - gpu::SHARED_IMAGE_USAGE_RASTER_WRITE | - gpu::SHARED_IMAGE_USAGE_RASTER_READ, - "VideoCaptureEffectsProcessorMultiPlanarSharedImage"); - shared_image = - sii->CreateSharedImage(std::move(info), std::move(buffer_handle)); - CHECK(shared_image); - - auto sync_token = sii->GenVerifiedSyncToken(); - auto shared_image_set = mojom::SharedImageBufferHandleSet::New( - shared_image->Export(), sync_token); - - return mojom::VideoBufferHandle::NewSharedImageHandle( - std::move(shared_image_set)); -} - -// Helper, creates VideoBufferHandle for the given buffer. -mojom::VideoBufferHandlePtr CreateBufferHandle( - const VideoCaptureDevice::Client::Buffer& buffer, - const mojom::VideoFrameInfo& frame_info, - VideoCaptureBufferType buffer_type, - scoped_refptr<gpu::ClientSharedImage>& shared_image) { - switch (buffer_type) { - case VideoCaptureBufferType::kSharedMemory: - // TODO(https://crbug.com/40222341): we don't need to return an - // `UnsafeShmemRegion` here but `buffer.handle_provider` does not have an - // option to return `ReadOnlySharedMemoryRegion`. - return mojom::VideoBufferHandle::NewUnsafeShmemRegion( - buffer.handle_provider->DuplicateAsUnsafeRegion()); - case VideoCaptureBufferType::kGpuMemoryBuffer: - return CreateGpuMemoryBufferHandle( - buffer.handle_provider->GetGpuMemoryBufferHandle(), frame_info, - shared_image); - default: - NOTREACHED(); - } -} - -} // namespace - -PostProcessDoneInfo::PostProcessDoneInfo( - VideoCaptureDevice::Client::Buffer buffer, - mojom::VideoFrameInfoPtr info) - : buffer(std::move(buffer)), info(std::move(info)) {} - -PostProcessDoneInfo::PostProcessDoneInfo(PostProcessDoneInfo&& other) = default; -PostProcessDoneInfo& PostProcessDoneInfo::operator=( - PostProcessDoneInfo&& other) = default; - -PostProcessDoneInfo::~PostProcessDoneInfo() = default; - -VideoCaptureEffectsProcessor::VideoCaptureEffectsProcessor( - mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor> - video_effects_processor) - : effects_processor_(std::move(video_effects_processor)) {} - -VideoCaptureEffectsProcessor::~VideoCaptureEffectsProcessor() { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -} - -void VideoCaptureEffectsProcessor::PostProcessData( - base::ReadOnlySharedMemoryRegion data, - mojom::VideoFrameInfoPtr frame_info, - VideoCaptureDevice::Client::Buffer out_buffer, - const VideoCaptureFormat& out_buffer_format, - VideoCaptureBufferType out_buffer_type, - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - - mojom::VideoBufferHandlePtr in_buffer_handle = - mojom::VideoBufferHandle::NewReadOnlyShmemRegion(std::move(data)); - - auto out_frame_info = frame_info->Clone(); - out_frame_info->pixel_format = out_buffer_format.pixel_format; - - scoped_refptr<gpu::ClientSharedImage> out_shared_image; - mojom::VideoBufferHandlePtr out_buffer_handle = CreateBufferHandle( - out_buffer, *out_frame_info, out_buffer_type, out_shared_image); - - PostProcessContext context(std::nullopt, {}, std::move(out_buffer), - std::move(out_shared_image), - std::move(post_process_cb)); - - TRACE_EVENT_BEGIN(TRACE_DISABLED_BY_DEFAULT("video_and_image_capture"), - "PostProcessContext::PostProcessContext()", - perfetto::Track(context.trace_id)); - - effects_processor_->PostProcess( - std::move(in_buffer_handle), std::move(frame_info), - std::move(out_buffer_handle), out_buffer_format.pixel_format, - base::BindOnce(&VideoCaptureEffectsProcessor::OnPostProcess, - weak_ptr_factory_.GetWeakPtr(), std::move(context))); -} - -void VideoCaptureEffectsProcessor::PostProcessBuffer( - VideoCaptureDevice::Client::Buffer in_buffer, - mojom::VideoFrameInfoPtr frame_info, - VideoCaptureBufferType in_buffer_type, - VideoCaptureDevice::Client::Buffer out_buffer, - const VideoCaptureFormat& out_buffer_format, - VideoCaptureBufferType out_buffer_type, - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - - scoped_refptr<gpu::ClientSharedImage> in_shared_image; - mojom::VideoBufferHandlePtr in_buffer_handle = CreateBufferHandle( - in_buffer, *frame_info, in_buffer_type, in_shared_image); - - auto out_frame_info = frame_info->Clone(); - out_frame_info->pixel_format = out_buffer_format.pixel_format; - - scoped_refptr<gpu::ClientSharedImage> out_shared_image; - mojom::VideoBufferHandlePtr out_buffer_handle = CreateBufferHandle( - out_buffer, *out_frame_info, out_buffer_type, out_shared_image); - - PostProcessContext context(std::move(in_buffer), std::move(in_shared_image), - std::move(out_buffer), std::move(out_shared_image), - std::move(post_process_cb)); - - TRACE_EVENT_BEGIN(TRACE_DISABLED_BY_DEFAULT("video_and_image_capture"), - "PostProcessContext::PostProcessContext()", - perfetto::Track(context.trace_id)); - - effects_processor_->PostProcess( - std::move(in_buffer_handle), std::move(frame_info), - std::move(out_buffer_handle), out_buffer_format.pixel_format, - base::BindOnce(&VideoCaptureEffectsProcessor::OnPostProcess, - weak_ptr_factory_.GetWeakPtr(), std::move(context))); -} - -void VideoCaptureEffectsProcessor::PostProcessExternalBuffer( - CapturedExternalVideoBuffer in_buffer, - mojom::VideoFrameInfoPtr frame_info, - VideoCaptureDevice::Client::Buffer out_buffer, - const VideoCaptureFormat& out_buffer_format, - VideoCaptureBufferType out_buffer_type, - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - - scoped_refptr<gpu::ClientSharedImage> in_shared_image; - mojom::VideoBufferHandlePtr in_buffer_handle = CreateGpuMemoryBufferHandle( - std::move(in_buffer.handle), *frame_info, in_shared_image); - - auto out_frame_info = frame_info->Clone(); - out_frame_info->pixel_format = out_buffer_format.pixel_format; - - scoped_refptr<gpu::ClientSharedImage> out_shared_image; - mojom::VideoBufferHandlePtr out_buffer_handle = CreateBufferHandle( - out_buffer, *out_frame_info, out_buffer_type, out_shared_image); - - PostProcessContext context(std::nullopt, std::move(in_shared_image), - std::move(out_buffer), std::move(out_shared_image), - std::move(post_process_cb)); - - TRACE_EVENT_BEGIN(TRACE_DISABLED_BY_DEFAULT("video_and_image_capture"), - "PostProcessContext::PostProcessContext()", - perfetto::Track(context.trace_id)); - - effects_processor_->PostProcess( - std::move(in_buffer_handle), std::move(frame_info), - std::move(out_buffer_handle), out_buffer_format.pixel_format, - base::BindOnce(&VideoCaptureEffectsProcessor::OnPostProcess, - weak_ptr_factory_.GetWeakPtr(), std::move(context))); -} - -base::WeakPtr<VideoCaptureEffectsProcessor> -VideoCaptureEffectsProcessor::GetWeakPtr() { - return weak_ptr_factory_.GetWeakPtr(); -} - -void VideoCaptureEffectsProcessor::OnPostProcess( - VideoCaptureEffectsProcessor::PostProcessContext context, - video_effects::mojom::PostProcessResultPtr result) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - - TRACE_EVENT_END(TRACE_DISABLED_BY_DEFAULT("video_and_image_capture"), - perfetto::Track(context.trace_id), "is_success", - result->is_success()); - - switch (result->which()) { - case video_effects::mojom::PostProcessResult::Tag::kSuccess: { - std::move(context.post_process_cb) - .Run(base::ok(PostProcessDoneInfo( - std::move(context.out_buffer), - std::move(result->get_success()->frame_info)))); - break; - } - case video_effects::mojom::PostProcessResult::Tag::kError: { - std::move(context.post_process_cb) - .Run(base::unexpected(result->get_error())); - break; - } - } -} - -VideoCaptureEffectsProcessor::PostProcessContext::PostProcessContext( - std::optional<VideoCaptureDevice::Client::Buffer> in_buffer, - scoped_refptr<gpu::ClientSharedImage> in_shared_image, - VideoCaptureDevice::Client::Buffer out_buffer, - scoped_refptr<gpu::ClientSharedImage> out_shared_image, - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb) - : in_buffer(std::move(in_buffer)), - in_shared_image(std::move(in_shared_image)), - out_buffer(std::move(out_buffer)), - out_shared_image(std::move(out_shared_image)), - post_process_cb(std::move(post_process_cb)) {} - -VideoCaptureEffectsProcessor::PostProcessContext::PostProcessContext( - VideoCaptureEffectsProcessor::PostProcessContext&& other) = default; - -VideoCaptureEffectsProcessor::PostProcessContext::~PostProcessContext() = - default; - -} // namespace media
diff --git a/media/capture/video/video_capture_effects_processor.h b/media/capture/video/video_capture_effects_processor.h deleted file mode 100644 index f3e3ea98..0000000 --- a/media/capture/video/video_capture_effects_processor.h +++ /dev/null
@@ -1,167 +0,0 @@ -// Copyright 2024 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_EFFECTS_PROCESSOR_H_ -#define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_EFFECTS_PROCESSOR_H_ - -#include <optional> - -#include "base/memory/read_only_shared_memory_region.h" -#include "base/memory/scoped_refptr.h" -#include "base/memory/weak_ptr.h" -#include "base/sequence_checker.h" -#include "base/trace_event/trace_id_helper.h" -#include "base/types/expected.h" -#include "gpu/command_buffer/client/shared_image_interface.h" -#include "media/capture/capture_export.h" -#include "media/capture/mojom/video_capture_buffer.mojom-forward.h" -#include "media/capture/video/video_capture_device.h" -#include "mojo/public/cpp/bindings/pending_remote.h" -#include "mojo/public/cpp/bindings/remote.h" -#include "services/video_effects/public/cpp/buildflags.h" -#include "services/video_effects/public/mojom/video_effects_processor.mojom.h" - -static_assert(BUILDFLAG(ENABLE_VIDEO_EFFECTS), - "enable_video_effects must be true."); - -namespace media { - -// Structure used to pass information about a post-processed video frame. -// Equivalent to `std::pair<VideoCaptureDevice::Client::Buffer, -// mojom::VideoFrameInfoPtr>`. -struct CAPTURE_EXPORT PostProcessDoneInfo { - // Note: style-guide allows us to use `explicit` keyword even for - // multi-parameter constructors. - explicit PostProcessDoneInfo(VideoCaptureDevice::Client::Buffer buffer, - mojom::VideoFrameInfoPtr info); - - PostProcessDoneInfo(PostProcessDoneInfo& other) = delete; - PostProcessDoneInfo& operator=(const PostProcessDoneInfo& other) = delete; - - PostProcessDoneInfo(PostProcessDoneInfo&& other); - PostProcessDoneInfo& operator=(PostProcessDoneInfo&& other); - - ~PostProcessDoneInfo(); - - VideoCaptureDevice::Client::Buffer buffer; - mojom::VideoFrameInfoPtr info; -}; - -// Companion class of `VideoCaptureDeviceClient`, used when video effects are -// enabled. Responsible for marshaling video frame data so that it's suitable -// for an IPC to Video Effects Processor, and for actually invoking the -// processor. -class CAPTURE_EXPORT VideoCaptureEffectsProcessor { - public: - // `video_effects_processor` remote will be used to apply the video effects. - explicit VideoCaptureEffectsProcessor( - mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor> - video_effects_processor); - - VideoCaptureEffectsProcessor(const VideoCaptureEffectsProcessor& other) = - delete; - VideoCaptureEffectsProcessor& operator=( - const VideoCaptureEffectsProcessor& other) = delete; - - VideoCaptureEffectsProcessor(VideoCaptureEffectsProcessor&& other) = delete; - VideoCaptureEffectsProcessor& operator=( - VideoCaptureEffectsProcessor&& other) = delete; - - ~VideoCaptureEffectsProcessor(); - - // Callback that will be called once the post-processor has completed - // processing a single frame. On success, the buffer will contain the - // processed frame (that was allocated by the client of the post-processor), - // and it is the same buffer that the client passed in to one of the - // PostProcess methods. The video frame info describes the video frame - // residing now in the buffer. - using PostProcessDoneCallback = base::OnceCallback<void( - base::expected<PostProcessDoneInfo, - video_effects::mojom::PostProcessError>)>; - - // On-CPU variant. Prepares the shared images backed by `out_buffer` for - // receiving the processing results. Invokes the processor. - void PostProcessData( - base::ReadOnlySharedMemoryRegion data, - mojom::VideoFrameInfoPtr frame_info, - VideoCaptureDevice::Client::Buffer out_buffer, - const VideoCaptureFormat& out_buffer_format, - VideoCaptureBufferType out_buffer_type, - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb); - - // On-GPU variant. Creates shared images backed by `in_buffer` and - // `out_buffer`. Invokes the processor. - void PostProcessBuffer( - VideoCaptureDevice::Client::Buffer in_buffer, - mojom::VideoFrameInfoPtr frame_info, - VideoCaptureBufferType in_buffer_type, - VideoCaptureDevice::Client::Buffer out_buffer, - const VideoCaptureFormat& out_buffer_format, - VideoCaptureBufferType out_buffer_type, - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb); - - // On-GPU variant. Creates shared images backed by `in_buffer` and - // `out_buffer`. Invokes the processor. (Mainly used on MacOS) - void PostProcessExternalBuffer( - CapturedExternalVideoBuffer in_buffer, - mojom::VideoFrameInfoPtr frame_info, - VideoCaptureDevice::Client::Buffer out_buffer, - const VideoCaptureFormat& out_buffer_format, - VideoCaptureBufferType out_buffer_type, - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb); - - base::WeakPtr<VideoCaptureEffectsProcessor> GetWeakPtr(); - - private: - struct PostProcessContext { - // Creates the context. If `in_buffer` is set, then `in_shared_image` must - // also be set for buffers that had shared images created from them. Same - // requirement applies for `out_buffer` and `out_shared_image`. If we don't - // maintain the ownership of shared images backed by the buffers, the dtors - // of `gpu::ClientSharedImage` will be invoked and the shared images won't - // be visible on the other side of the IPC, despite being exported for IPC. - PostProcessContext( - std::optional<VideoCaptureDevice::Client::Buffer> in_buffer, - scoped_refptr<gpu::ClientSharedImage> in_shared_image, - VideoCaptureDevice::Client::Buffer out_buffer, - scoped_refptr<gpu::ClientSharedImage> out_shared_image, - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb); - ~PostProcessContext(); - - PostProcessContext(const PostProcessContext& other) = delete; - PostProcessContext& operator=(const PostProcessContext& other) = delete; - - // Note: the class is move-constructible but not move-assignable! - // This is a consequence of `trace_id` being const. - PostProcessContext(PostProcessContext&& other); - PostProcessContext& operator=(PostProcessContext&& other) = delete; - - const uint64_t trace_id = base::trace_event::GetNextGlobalTraceId(); - - // May be std::nullopt if the context was created for a post-process request - // that operates on on-CPU data - we won't have an `in_buffer` in this case. - std::optional<VideoCaptureDevice::Client::Buffer> in_buffer; - // May be null if `in_buffer` is not set. - scoped_refptr<gpu::ClientSharedImage> in_shared_image; - - VideoCaptureDevice::Client::Buffer out_buffer; - scoped_refptr<gpu::ClientSharedImage> out_shared_image; - VideoCaptureEffectsProcessor::PostProcessDoneCallback post_process_cb; - }; - - void OnPostProcess(PostProcessContext context, - video_effects::mojom::PostProcessResultPtr result); - - mojo::Remote<video_effects::mojom::VideoEffectsProcessor> effects_processor_ - GUARDED_BY_CONTEXT(sequence_checker_); - - SEQUENCE_CHECKER(sequence_checker_); - - // Must be last: - base::WeakPtrFactory<VideoCaptureEffectsProcessor> weak_ptr_factory_{this}; -}; - -} // namespace media - -#endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_EFFECTS_PROCESSOR_H_
diff --git a/media/capture/video/video_capture_effects_processor_unittest.cc b/media/capture/video/video_capture_effects_processor_unittest.cc deleted file mode 100644 index 1cb7a35..0000000 --- a/media/capture/video/video_capture_effects_processor_unittest.cc +++ /dev/null
@@ -1,271 +0,0 @@ -// Copyright 2024 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "media/capture/video/video_capture_effects_processor.h" - -#include <numeric> -#include <optional> - -#include "base/memory/read_only_shared_memory_region.h" -#include "base/memory/scoped_refptr.h" -#include "base/memory/shared_memory_mapping.h" -#include "base/notreached.h" -#include "base/test/task_environment.h" -#include "base/test/test_future.h" -#include "base/time/time.h" -#include "components/viz/test/test_context_provider.h" -#include "gpu/command_buffer/client/shared_image_interface.h" -#include "media/base/video_frame_metadata.h" -#include "media/base/video_types.h" -#include "media/capture/mojom/video_capture_buffer.mojom.h" -#include "media/capture/video/video_capture_device.h" -#include "media/capture/video/video_capture_gpu_channel_host.h" -#include "media/capture/video_capture_types.h" -#include "mojo/public/cpp/bindings/pending_receiver.h" -#include "mojo/public/cpp/bindings/pending_remote.h" -#include "mojo/public/cpp/bindings/receiver.h" -#include "services/video_effects/public/cpp/buildflags.h" -#include "services/video_effects/public/mojom/video_effects_processor.mojom.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/color_space.h" -#include "ui/gfx/geometry/rect.h" -#include "ui/gfx/geometry/size.h" - -static_assert(BUILDFLAG(ENABLE_VIDEO_EFFECTS), - "enable_video_effects must be true."); - -namespace media { - -namespace { - -size_t GetBitsPerPixel(VideoPixelFormat format) { - switch (format) { - case VideoPixelFormat::PIXEL_FORMAT_ARGB: - return 32; - case VideoPixelFormat::PIXEL_FORMAT_I420: - case VideoPixelFormat::PIXEL_FORMAT_NV12: - return 12; - default: - NOTREACHED(); - } -} - -class HandleProvider - : public VideoCaptureDevice::Client::Buffer::HandleProvider { - public: - ~HandleProvider() override = default; - - base::UnsafeSharedMemoryRegion DuplicateAsUnsafeRegion() override { - return {}; - } - - std::unique_ptr<VideoCaptureBufferHandle> GetHandleForInProcessAccess() - override { - return {}; - } - - gfx::GpuMemoryBufferHandle GetGpuMemoryBufferHandle() override { return {}; } -}; - -class ScopedAccessPermission - : public VideoCaptureDevice::Client::Buffer::ScopedAccessPermission { - public: - ~ScopedAccessPermission() override = default; -}; - -class VideoEffectsProcessor - : public video_effects::mojom::VideoEffectsProcessor { - public: - explicit VideoEffectsProcessor( - mojo::PendingReceiver<video_effects::mojom::VideoEffectsProcessor> - receiver) - : receiver_(this, std::move(receiver)) {} - - void PostProcess(mojom::VideoBufferHandlePtr input_frame_data, - mojom::VideoFrameInfoPtr input_frame_info, - mojom::VideoBufferHandlePtr result_frame_data, - VideoPixelFormat result_pixel_format, - PostProcessCallback callback) override { - input_frame_info->pixel_format = result_pixel_format; - std::move(callback).Run(video_effects::mojom::PostProcessResult::NewSuccess( - video_effects::mojom::PostProcessSuccess::New( - std::move(input_frame_info)))); - } - - private: - mojo::Receiver<video_effects::mojom::VideoEffectsProcessor> receiver_; -}; - -constexpr gfx::Size kValidFrameSize = gfx::Size(10, 10); -constexpr base::TimeDelta kValidTimeDelta = base::Seconds(1); -constexpr float kValidFrameRate = 1.0f; - -} // namespace - -class VideoCaptureEffectsProcessorTest - : public testing::TestWithParam<VideoPixelFormat> { - public: - void SetUp() override { - test_sii_ = base::MakeRefCounted<gpu::TestSharedImageInterface>(); - - mojo::PendingReceiver<video_effects::mojom::VideoEffectsProcessor> - pending_receiver; - capture_processor_.emplace(pending_receiver.InitWithNewPipeAndPassRemote()); - - video_effects_processor_.emplace(std::move(pending_receiver)); - - auto& gpu_channel_host = VideoCaptureGpuChannelHost::GetInstance(); - gpu_channel_host.SetSharedImageInterface(test_sii_); - } - - void TearDown() override { - auto& gpu_channel_host = VideoCaptureGpuChannelHost::GetInstance(); - gpu_channel_host.SetSharedImageInterface(nullptr); - } - - VideoPixelFormat GetPixelFormat() { return GetParam(); } - - protected: - base::test::TaskEnvironment task_environment_; - - scoped_refptr<gpu::TestSharedImageInterface> test_sii_; - - std::optional<VideoEffectsProcessor> video_effects_processor_; - - // Code-under-test. Created in `SetUp()`. - std::optional<VideoCaptureEffectsProcessor> capture_processor_; -}; - -TEST_P(VideoCaptureEffectsProcessorTest, PostProcessDataSucceeds) { - const VideoPixelFormat pixel_format = GetPixelFormat(); - - base::test::TestFuture<base::expected<PostProcessDoneInfo, - video_effects::mojom::PostProcessError>> - post_process_future; - - const gfx::Size coded_size = kValidFrameSize; - base::MappedReadOnlyRegion frame_region = - base::ReadOnlySharedMemoryRegion::Create( - coded_size.Area64() * GetBitsPerPixel(pixel_format) / 8); - ASSERT_TRUE(frame_region.IsValid()); - auto frame_span = frame_region.mapping.GetMemoryAsSpan<uint8_t>(); - std::iota(frame_span.begin(), frame_span.end(), 1); - - mojom::VideoFrameInfoPtr info = mojom::VideoFrameInfo::New( - kValidTimeDelta, media::VideoFrameMetadata{}, pixel_format, coded_size, - gfx::Rect(coded_size), /*is_premapped=*/false, - gfx::ColorSpace::CreateREC709(), media::mojom::PlaneStridesPtr{}); - - VideoCaptureDevice::Client::Buffer out_buffer( - /*buffer_id=*/0, /*frame_feedback_id=*/0, - std::make_unique<HandleProvider>(), - std::make_unique<ScopedAccessPermission>()); - - capture_processor_->PostProcessData( - std::move(frame_region.region), std::move(info), std::move(out_buffer), - VideoCaptureFormat(coded_size, kValidFrameRate, - VideoPixelFormat::PIXEL_FORMAT_NV12), - VideoCaptureBufferType::kGpuMemoryBuffer, - post_process_future.GetCallback()); - - EXPECT_TRUE(post_process_future.Wait()); -} - -TEST_P(VideoCaptureEffectsProcessorTest, PostProcessBufferSucceeds) { - const VideoPixelFormat pixel_format = GetPixelFormat(); - if (pixel_format != VideoPixelFormat::PIXEL_FORMAT_NV12) { - // The post-processor does not support formats other than NV12 for on-GPU - // data yet - skip this test. - GTEST_SKIP(); - } - - base::test::TestFuture<base::expected<PostProcessDoneInfo, - video_effects::mojom::PostProcessError>> - post_process_future; - - const gfx::Size coded_size = kValidFrameSize; - std::vector<uint8_t> frame_data(coded_size.Area64() * - GetBitsPerPixel(pixel_format) / 8); - std::iota(frame_data.begin(), frame_data.end(), 1); - - mojom::VideoFrameInfoPtr info = mojom::VideoFrameInfo::New( - kValidTimeDelta, media::VideoFrameMetadata{}, pixel_format, coded_size, - gfx::Rect(coded_size), /*is_premapped=*/false, - gfx::ColorSpace::CreateREC709(), media::mojom::PlaneStridesPtr{}); - - VideoCaptureDevice::Client::Buffer in_buffer( - /*buffer_id=*/0, /*frame_feedback_id=*/0, - std::make_unique<HandleProvider>(), - std::make_unique<ScopedAccessPermission>()); - - VideoCaptureDevice::Client::Buffer out_buffer( - /*buffer_id=*/1, /*frame_feedback_id=*/1, - std::make_unique<HandleProvider>(), - std::make_unique<ScopedAccessPermission>()); - - capture_processor_->PostProcessBuffer( - std::move(in_buffer), std::move(info), - VideoCaptureBufferType::kGpuMemoryBuffer, std::move(out_buffer), - VideoCaptureFormat(coded_size, kValidFrameRate, - VideoPixelFormat::PIXEL_FORMAT_NV12), - VideoCaptureBufferType::kGpuMemoryBuffer, - post_process_future.GetCallback()); - - EXPECT_TRUE(post_process_future.Wait()); -} - -TEST_P(VideoCaptureEffectsProcessorTest, PostProcessExternalBufferSucceeds) { - const VideoPixelFormat pixel_format = GetPixelFormat(); - if (pixel_format != VideoPixelFormat::PIXEL_FORMAT_NV12) { - // The post-processor does not support formats other than NV12 for on-GPU - // data yet - skip this test. - GTEST_SKIP(); - } - - base::test::TestFuture<base::expected<PostProcessDoneInfo, - video_effects::mojom::PostProcessError>> - post_process_future; - - const gfx::Size coded_size = kValidFrameSize; - std::vector<uint8_t> frame_data(coded_size.Area64() * - GetBitsPerPixel(pixel_format) / 8); - std::iota(frame_data.begin(), frame_data.end(), 1); - - mojom::VideoFrameInfoPtr info = mojom::VideoFrameInfo::New( - kValidTimeDelta, media::VideoFrameMetadata{}, pixel_format, coded_size, - gfx::Rect(coded_size), /*is_premapped=*/false, - gfx::ColorSpace::CreateREC709(), media::mojom::PlaneStridesPtr{}); - - CapturedExternalVideoBuffer in_buffer( - gfx::GpuMemoryBufferHandle(), - VideoCaptureFormat(coded_size, kValidFrameRate, PIXEL_FORMAT_NV12), - gfx::ColorSpace::CreateREC709()); - - VideoCaptureDevice::Client::Buffer out_buffer( - /*buffer_id=*/1, /*frame_feedback_id=*/1, - std::make_unique<HandleProvider>(), - std::make_unique<ScopedAccessPermission>()); - - capture_processor_->PostProcessExternalBuffer( - std::move(in_buffer), std::move(info), std::move(out_buffer), - VideoCaptureFormat(coded_size, kValidFrameRate, - VideoPixelFormat::PIXEL_FORMAT_NV12), - VideoCaptureBufferType::kGpuMemoryBuffer, - post_process_future.GetCallback()); - - EXPECT_TRUE(post_process_future.Wait()); -} - -INSTANTIATE_TEST_SUITE_P( - All, - VideoCaptureEffectsProcessorTest, - testing::Values(media::VideoPixelFormat::PIXEL_FORMAT_I420, - media::VideoPixelFormat::PIXEL_FORMAT_NV12, - media::VideoPixelFormat::PIXEL_FORMAT_ARGB), - [](const testing::TestParamInfo< - VideoCaptureEffectsProcessorTest::ParamType>& info) { - return VideoPixelFormatToString(info.param); - }); - -} // namespace media
diff --git a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc index 5a5fdfd..3d7b4021 100644 --- a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc +++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
@@ -232,14 +232,8 @@ // Makes sure files and corresponding signature files are readable but not // writable. -bool VerifyCdmHost_0(base::span<const cdm::HostFile> host_files, - uint32_t spanification_suspected_redundant_num_files) { - // TODO(crbug.com/431824301): Remove unneeded parameter once validated to be - // redundant in M143. - CHECK(spanification_suspected_redundant_num_files == host_files.size(), - base::NotFatalUntil::M143); - LOG(WARNING) << __func__ << ": " - << spanification_suspected_redundant_num_files; +bool VerifyCdmHost_0(const cdm::HostFile* host_files, uint32_t num_files) { + LOG(WARNING) << __func__ << ": " << num_files; // We should always have the CDM and at least one common file. // The common CDM host file (e.g. chrome) might not exist since we are running @@ -249,15 +243,14 @@ // We should always have the CDM. const int kNumCdmFiles = 1; - if (spanification_suspected_redundant_num_files < kMinNumHostFiles) { - LOG(ERROR) << "Too few host files: " - << spanification_suspected_redundant_num_files; + if (num_files < kMinNumHostFiles) { + LOG(ERROR) << "Too few host files: " << num_files; g_verify_host_files_result = false; return true; } int num_opened_files = 0; - for (uint32_t i = 0; i < spanification_suspected_redundant_num_files; ++i) { + for (uint32_t i = 0; i < num_files; ++i) { const int kBytesToRead = 10; std::vector<char> buffer(kBytesToRead);
diff --git a/net/BUILD.gn b/net/BUILD.gn index 3301f07..a2db3bb 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn
@@ -1817,6 +1817,7 @@ "disk_cache/sql/cache_entry_key.h", "disk_cache/sql/exclusive_operation_coordinator.cc", "disk_cache/sql/exclusive_operation_coordinator.h", + "disk_cache/sql/indexed_pair_set.h", "disk_cache/sql/sql_backend_constants.h", "disk_cache/sql/sql_backend_impl.cc", "disk_cache/sql/sql_backend_impl.h", @@ -3499,6 +3500,7 @@ sources += [ "disk_cache/sql/cache_entry_key_unittest.cc", "disk_cache/sql/exclusive_operation_coordinator_unittest.cc", + "disk_cache/sql/indexed_pair_set_unittest.cc", "disk_cache/sql/sql_backend_impl_unittest.cc", "disk_cache/sql/sql_persistent_store_unittest.cc", ]
diff --git a/net/disk_cache/sql/indexed_pair_set.h b/net/disk_cache/sql/indexed_pair_set.h new file mode 100644 index 0000000..2ac0565 --- /dev/null +++ b/net/disk_cache/sql/indexed_pair_set.h
@@ -0,0 +1,176 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NET_DISK_CACHE_SQL_INDEXED_PAIR_SET_H_ +#define NET_DISK_CACHE_SQL_INDEXED_PAIR_SET_H_ + +#include <vector> + +#include "base/check.h" +#include "net/base/net_export.h" +#include "third_party/abseil-cpp/absl/container/flat_hash_map.h" +#include "third_party/abseil-cpp/absl/container/flat_hash_set.h" + +namespace disk_cache { + +// IndexedPairSet is a memory-efficient data structure that stores a set of +// unique (Key, Value) pairs. It is optimized for cases where keys typically +// have only one associated value, but it can accommodate multiple values per +// key. +// +// To conserve memory, this class avoids the overhead of a nested container +// (like absl::flat_hash_map<Key, absl::flat_hash_set<Value>>) for the +// common case of a single value per key. It achieves this by storing the first +// value for a key in a primary map (`primary_map_`). Subsequent, unique values +// for the same key are stored in a secondary map (`secondary_map_`) that maps +// keys to a set of additional values. +// +// This design enables a fast `Contains(key)` lookup, as it only requires +// checking the primary map. However, this optimization makes `Insert` and +// `Remove` operations more complex. For instance, if the representative value +// in the primary map is removed, a new value from the secondary map must be +// promoted to take its place, if one exists. +template <class Key, class Value> +class NET_EXPORT_PRIVATE IndexedPairSet { + public: + IndexedPairSet() = default; + ~IndexedPairSet() = default; + + IndexedPairSet(const IndexedPairSet&) = delete; + IndexedPairSet& operator=(const IndexedPairSet&) = delete; + + IndexedPairSet(IndexedPairSet&& other) noexcept + : primary_map_(std::move(other.primary_map_)), + secondary_map_(std::move(other.secondary_map_)), + size_(other.size_) { + other.size_ = 0; + } + + IndexedPairSet& operator=(IndexedPairSet&& other) noexcept { + if (this == &other) { + return *this; + } + primary_map_ = std::move(other.primary_map_); + secondary_map_ = std::move(other.secondary_map_); + size_ = other.size_; + other.size_ = 0; + return *this; + } + + // Inserts a key-value pair if it does not already exist. + // Returns true if the pair was inserted, false if it already existed. + bool Insert(Key key, Value value) { + auto primary_it = primary_map_.find(key); + if (primary_it == primary_map_.end()) { + // Key is new, insert into primary_map. + primary_map_.insert({key, value}); + size_++; + return true; + } + + if (primary_it->second == value) { + // Exact pair already exists in primary_map. + return false; + } + auto insert_result = secondary_map_[key].insert(value); + if (insert_result.second) { + size_++; + return true; + } + // Exact pair already exists in secondary_map_. + return false; + } + + // Finds all values associated with a given key. + std::vector<Value> Find(Key key) const { + std::vector<Value> results; + auto primary_it = primary_map_.find(key); + if (primary_it == primary_map_.end()) { + return results; + } + + results.push_back(primary_it->second); + + auto secondary_it = secondary_map_.find(key); + if (secondary_it != secondary_map_.end()) { + results.insert(results.end(), secondary_it->second.begin(), + secondary_it->second.end()); + } + return results; + } + + // Removes a specific key-value pair. Returns true if the pair was found and + // removed, false otherwise. + bool Remove(Key key, Value value) { + auto primary_it = primary_map_.find(key); + if (primary_it == primary_map_.end()) { + return false; // Key does not exist. + } + + if (primary_it->second == value) { + // The value to remove is in the primary_map. + auto secondary_it = secondary_map_.find(key); + if (secondary_it != secondary_map_.end()) { + // Promote a value from secondary_map_. + CHECK(!secondary_it->second.empty()); + auto& secondary_set = secondary_it->second; + Value new_base_value = *secondary_set.begin(); + secondary_set.erase(secondary_set.begin()); + primary_it->second = new_base_value; + if (secondary_set.empty()) { + secondary_map_.erase(secondary_it); + } + } else { + // No additional values, just remove from primary_map. + primary_map_.erase(primary_it); + } + size_--; + return true; + } + + // The value to remove is not in primary_map, check secondary_map_. + auto secondary_it = secondary_map_.find(key); + if (secondary_it != secondary_map_.end()) { + if (secondary_it->second.erase(value) > 0) { + if (secondary_it->second.empty()) { + secondary_map_.erase(secondary_it); + } + size_--; + return true; + } + } + // Value not found. + return false; + } + + // Returns true if the given key exists. This is a fast lookup. + bool Contains(Key key) const { return primary_map_.contains(key); } + + // Returns the total number of elements in the set. + size_t size() const { return size_; } + + // Returns true if the set is empty. + bool empty() const { return size_ == 0; } + + // Removes all elements from the set. + void Clear() { + primary_map_.clear(); + secondary_map_.clear(); + size_ = 0; + } + + // Test-only methods + bool SecondaryMapContainsKeyForTesting(const Key& key) const { + return secondary_map_.contains(key); + } + + private: + absl::flat_hash_map<Key, Value> primary_map_; + absl::flat_hash_map<Key, absl::flat_hash_set<Value>> secondary_map_; + size_t size_ = 0; +}; + +} // namespace disk_cache + +#endif // NET_DISK_CACHE_SQL_INDEXED_PAIR_SET_H_
diff --git a/net/disk_cache/sql/indexed_pair_set_unittest.cc b/net/disk_cache/sql/indexed_pair_set_unittest.cc new file mode 100644 index 0000000..ccd6f26 --- /dev/null +++ b/net/disk_cache/sql/indexed_pair_set_unittest.cc
@@ -0,0 +1,262 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/disk_cache/sql/indexed_pair_set.h" + +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" + +using testing::UnorderedElementsAre; + +namespace disk_cache { + +class IndexedPairSetTest : public testing::Test { + protected: + IndexedPairSet<int64_t, int64_t> set_; +}; + +TEST_F(IndexedPairSetTest, EmptyInitially) { + EXPECT_TRUE(set_.empty()); + EXPECT_EQ(0u, set_.size()); +} + +TEST_F(IndexedPairSetTest, InsertAndFindSingleValue) { + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_FALSE(set_.empty()); + EXPECT_EQ(1u, set_.size()); + EXPECT_TRUE(set_.Contains(10)); + + std::vector<int64_t> values = set_.Find(10); + ASSERT_EQ(1u, values.size()); + EXPECT_EQ(100, values[0]); +} + +TEST_F(IndexedPairSetTest, InsertDuplicatePair) { + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_EQ(1u, set_.size()); + + // Inserting the exact same pair should do nothing and return false. + EXPECT_FALSE(set_.Insert(10, 100)); + EXPECT_EQ(1u, set_.size()); + + EXPECT_TRUE(set_.Insert(10, 200)); + EXPECT_EQ(2u, set_.size()); + + // Inserting the exact same pair which exists in the secondary map should do + // nothing and return false. + EXPECT_FALSE(set_.Insert(10, 200)); + EXPECT_EQ(2u, set_.size()); +} + +TEST_F(IndexedPairSetTest, InsertDuplicateKey) { + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_TRUE(set_.Insert(10, 200)); + EXPECT_EQ(2u, set_.size()); + + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(100, 200)); + + EXPECT_TRUE(set_.Insert(10, 300)); + EXPECT_EQ(3u, set_.size()); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(100, 200, 300)); +} + +TEST_F(IndexedPairSetTest, Contains) { + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_TRUE(set_.Insert(20, 200)); + EXPECT_TRUE(set_.Insert(10, 300)); + + EXPECT_TRUE(set_.Contains(10)); + EXPECT_TRUE(set_.Contains(20)); + EXPECT_FALSE(set_.Contains(99)); // Non-existent key +} + +TEST_F(IndexedPairSetTest, Clear) { + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_TRUE(set_.Insert(20, 200)); + EXPECT_FALSE(set_.empty()); + + set_.Clear(); + EXPECT_TRUE(set_.empty()); + EXPECT_EQ(0u, set_.size()); + EXPECT_FALSE(set_.Contains(10)); + EXPECT_TRUE(set_.Find(20).empty()); +} + +TEST_F(IndexedPairSetTest, RemoveNonExistent) { + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_FALSE(set_.Remove(99, 999)); // Non-existent key + EXPECT_FALSE(set_.Remove(10, 999)); // Non-existent value + EXPECT_EQ(1u, set_.size()); +} + +TEST_F(IndexedPairSetTest, RemoveSingleValue) { + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_TRUE(set_.Remove(10, 100)); + + EXPECT_EQ(0u, set_.size()); + EXPECT_TRUE(set_.empty()); + EXPECT_FALSE(set_.Contains(10)); + EXPECT_TRUE(set_.Find(10).empty()); +} + +TEST_F(IndexedPairSetTest, RemoveMultipleValuesForKey) { + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_TRUE(set_.Insert(10, 200)); + EXPECT_TRUE(set_.Insert(10, 300)); + EXPECT_EQ(3u, set_.size()); + + // Remove a value from the secondary_map_. + EXPECT_TRUE(set_.Remove(10, 200)); + EXPECT_EQ(2u, set_.size()); + EXPECT_TRUE(set_.Contains(10)); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(100, 300)); + + // Remove a value from the primary_map_, triggering a promotion. + EXPECT_TRUE(set_.Remove(10, 100)); + EXPECT_EQ(1u, set_.size()); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(300)); + + // Remove the final value. + EXPECT_TRUE(set_.Remove(10, 300)); + EXPECT_EQ(0u, set_.size()); + EXPECT_FALSE(set_.Contains(10)); +} + +TEST_F(IndexedPairSetTest, RemovePromotesFromAdditionalMap) { + set_.Insert(10, 100); + set_.Insert(10, 200); + set_.Insert(10, 300); + + // This will remove 100 from the primary_map_ and promote one of the values + // from secondary_map_ (either 200 or 300). + EXPECT_TRUE(set_.Remove(10, 100)); + EXPECT_EQ(2u, set_.size()); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(200, 300)); +} + +TEST_F(IndexedPairSetTest, RemoveLastFromAdditionalMapEmptiesSet) { + set_.Insert(10, 100); + set_.Insert(10, 200); + + // Remove the value from the secondary_map_. + EXPECT_TRUE(set_.Remove(10, 200)); + EXPECT_EQ(1u, set_.size()); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(100)); + + // The secondary_map_ should now be empty for key 10. + // Inserting a new value should work as expected. + EXPECT_TRUE(set_.Insert(10, 300)); + EXPECT_EQ(2u, set_.size()); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(100, 300)); +} + +TEST_F(IndexedPairSetTest, RemoveFromAdditionalMapThenInsertNewValue) { + // Setup: + // primary_map_ will contain: {10, 100}, {20, 300} + // secondary_map_ will contain: {10, {200}} + EXPECT_TRUE(set_.Insert(10, 100)); + EXPECT_TRUE(set_.Insert(10, 200)); + EXPECT_TRUE(set_.Insert(20, 300)); + EXPECT_EQ(3u, set_.size()); + + // Action: Remove the only value for key 10 from the secondary_map_. + EXPECT_TRUE(set_.Remove(10, 200)); + EXPECT_EQ(2u, set_.size()); + + // Verification: The secondary_map_ should no longer have an entry for + // key 10. Inserting a new value for key 10 should add it to the + // secondary_map_. + EXPECT_TRUE(set_.Insert(10, 400)); + EXPECT_EQ(3u, set_.size()); + + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(100, 400)); +} + +TEST_F(IndexedPairSetTest, MoveConstructor) { + set_.Insert(10, 100); + set_.Insert(20, 200); + EXPECT_EQ(2u, set_.size()); + + IndexedPairSet<int64_t, int64_t> new_set(std::move(set_)); + + // The old set should be empty. + EXPECT_EQ(0u, set_.size()); + EXPECT_TRUE(set_.empty()); + + // The new set should have the data. + EXPECT_EQ(2u, new_set.size()); + EXPECT_TRUE(new_set.Contains(10)); + EXPECT_TRUE(new_set.Contains(20)); + EXPECT_THAT(new_set.Find(10), UnorderedElementsAre(100)); + EXPECT_THAT(new_set.Find(20), UnorderedElementsAre(200)); +} + +TEST_F(IndexedPairSetTest, MoveAssignment) { + set_.Insert(10, 100); + set_.Insert(20, 200); + + IndexedPairSet<int64_t, int64_t> new_set; + new_set.Insert(30, 300); + + new_set = std::move(set_); + + // The old set should be empty. + EXPECT_EQ(0u, set_.size()); + EXPECT_TRUE(set_.empty()); + + // The new set should have the moved data. + EXPECT_EQ(2u, new_set.size()); + EXPECT_TRUE(new_set.Contains(10)); + EXPECT_TRUE(new_set.Contains(20)); + EXPECT_THAT(new_set.Find(10), UnorderedElementsAre(100)); + EXPECT_THAT(new_set.Find(20), UnorderedElementsAre(200)); + EXPECT_FALSE(new_set.Contains(30)); // Original data should be gone. +} + +TEST_F(IndexedPairSetTest, MoveAssignmentSelf) { + set_.Insert(10, 100); + set_.Insert(20, 200); + EXPECT_EQ(2u, set_.size()); + + set_ = std::move(set_); + + // The set should be unchanged. + EXPECT_EQ(2u, set_.size()); + EXPECT_TRUE(set_.Contains(10)); + EXPECT_TRUE(set_.Contains(20)); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(100)); + EXPECT_THAT(set_.Find(20), UnorderedElementsAre(200)); +} + +TEST_F(IndexedPairSetTest, RemoveLastValueFromSecondaryMapRemovesKey) { + set_.Insert(10, 100); + set_.Insert(10, 200); + EXPECT_TRUE(set_.SecondaryMapContainsKeyForTesting(10)); + + // Remove the value from the secondary_map. + EXPECT_TRUE(set_.Remove(10, 200)); + EXPECT_EQ(1u, set_.size()); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(100)); + + // The key should no longer exist in the secondary_map. + EXPECT_FALSE(set_.SecondaryMapContainsKeyForTesting(10)); +} + +TEST_F(IndexedPairSetTest, RemoveAndPromoteWithEmptyingSecondaryMapRemovesKey) { + set_.Insert(10, 100); + set_.Insert(10, 200); + EXPECT_TRUE(set_.SecondaryMapContainsKeyForTesting(10)); + + // This will remove 100 from the primary_map and promote 200 from the + // secondary_map. After promotion, the secondary_map should be empty for key + // 10, so the key should be removed. + EXPECT_TRUE(set_.Remove(10, 100)); + EXPECT_EQ(1u, set_.size()); + EXPECT_THAT(set_.Find(10), UnorderedElementsAre(200)); + + // The key should no longer exist in the secondary_map. + EXPECT_FALSE(set_.SecondaryMapContainsKeyForTesting(10)); +} + +} // namespace disk_cache
diff --git a/net/dns/host_resolver_dns_task.cc b/net/dns/host_resolver_dns_task.cc index b080862..4cb7683 100644 --- a/net/dns/host_resolver_dns_task.cc +++ b/net/dns/host_resolver_dns_task.cc
@@ -28,7 +28,7 @@ namespace net { // When enabled, query HTTPS RR first. -BASE_FEATURE(kPrioritizeHttpsResourceRecord, base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kPrioritizeHttpsResourceRecord, base::FEATURE_ENABLED_BY_DEFAULT); namespace {
diff --git a/net/http/http_stream_pool.h b/net/http/http_stream_pool.h index 7ad9c96..000aa40 100644 --- a/net/http/http_stream_pool.h +++ b/net/http/http_stream_pool.h
@@ -154,6 +154,7 @@ class NET_EXPORT_PRIVATE AttemptManager; class NET_EXPORT_PRIVATE IPEndPointStateTracker; class NET_EXPORT_PRIVATE TcpBasedAttempt; + class NET_EXPORT_PRIVATE TcpBasedAttemptSlot; class NET_EXPORT_PRIVATE QuicAttempt; struct NET_EXPORT_PRIVATE QuicAttemptOutcome { explicit QuicAttemptOutcome(int result) : result(result) {}
diff --git a/net/http/http_stream_pool_attempt_manager.cc b/net/http/http_stream_pool_attempt_manager.cc index e4929a3..7c6b5af3 100644 --- a/net/http/http_stream_pool_attempt_manager.cc +++ b/net/http/http_stream_pool_attempt_manager.cc
@@ -350,9 +350,10 @@ // TODO(crbug.com/383824591): Consider modifying the value of // IPEndPointStateMap to track the number of in-flight attempts per // IPEndPoint, if this loop is a bottlenek. - size_t num_attempts = std::ranges::count( - tcp_based_attempts_, ip_endpoint, - [](const auto& entry) { return entry->attempt()->ip_endpoint(); }); + size_t num_attempts = std::ranges::count_if( + tcp_based_attempt_slots_, [&ip_endpoint](const auto& slot) { + return slot->HasIPEndPoint(ip_endpoint); + }); return num_attempts >= std::max(request_jobs_.size(), CalculateMaxPreconnectCount()); @@ -481,29 +482,33 @@ /*max_attempts=*/1); } +size_t HttpStreamPool::AttemptManager::NonSlowTcpBasedAttemptCount() const { + return std::ranges::count_if( + tcp_based_attempt_slots_, + [](const std::unique_ptr<TcpBasedAttemptSlot>& slot) { + return !slot->IsSlow(); + }); +} + void HttpStreamPool::AttemptManager::CancelTcpBasedAttempts( StreamSocketCloseReason reason) { - if (tcp_based_attempts_.empty()) { + if (tcp_based_attempt_slots_.empty()) { return; } - const size_t num_cancel_attempts = tcp_based_attempts_.size(); + const size_t num_cancels = tcp_based_attempt_slots_.size(); const size_t num_total_connecting_before = pool()->TotalConnectingStreamCount(); - while (!tcp_based_attempts_.empty()) { - std::unique_ptr<TcpBasedAttempt> attempt = - ExtractTcpBasedAttempt(tcp_based_attempts_.begin()->get()); - attempt->SetCancelReason(reason); - attempt.reset(); + while (!tcp_based_attempt_slots_.empty()) { + CancelTcpBasedAttemptSlot(tcp_based_attempt_slots_.begin()->get(), reason); } CHECK_EQ(pool()->TotalConnectingStreamCount(), - num_total_connecting_before - num_cancel_attempts); - CHECK_EQ(slow_tcp_based_attempt_count_, 0u); + num_total_connecting_before - num_cancels); base::UmaHistogramCounts100( base::StrCat({"Net.HttpStreamPool.TcpBasedAttemptCancelCount.", StreamSocketCloseReasonToString(reason)}), - num_cancel_attempts); + num_cancels); ip_endpoint_state_tracker_.RemoveSlowAttemptingEndpoint(); @@ -609,9 +614,8 @@ LoadState load_state = LOAD_STATE_IDLE; // When there are TCP based attempts, use most advanced one. - for (const auto& tcp_based_attempt : tcp_based_attempts_) { - load_state = - std::max(load_state, tcp_based_attempt->attempt()->GetLoadState()); + for (const auto& slot : tcp_based_attempt_slots_) { + load_state = std::max(load_state, slot->GetLoadState()); // There should not be a load state later than LOAD_STATE_SSL_HANDSHAKE. if (load_state == LOAD_STATE_SSL_HANDSHAKE) { break; @@ -682,7 +686,7 @@ } std::unique_ptr<TcpBasedAttempt> tcp_based_attempt = - ExtractTcpBasedAttempt(raw_attempt); + ExtractTcpBasedAttempt(raw_attempt, rv); if (rv != OK) { HandleTcpBasedAttemptFailure(std::move(tcp_based_attempt), rv); @@ -761,8 +765,6 @@ void HttpStreamPool::AttemptManager::OnTcpBasedAttemptSlow( TcpBasedAttempt* raw_attempt) { CHECK(raw_attempt->is_slow()); - auto it = tcp_based_attempts_.find(raw_attempt); - CHECK(it != tcp_based_attempts_.end()); TRACE_EVENT_INSTANT("net.stream", "AttemptManager::OnTcpBasedAttemptSlow", track_, "ip_endpoint", @@ -774,7 +776,6 @@ raw_attempt->ip_endpoint().ToString()); }); - ++slow_tcp_based_attempt_count_; ip_endpoint_state_tracker_.OnEndpointSlow(raw_attempt->ip_endpoint()); // Don't attempt the same IP endpoint. @@ -873,9 +874,8 @@ static_cast<int>(limit_ignoring_jobs_.size())); dict.Set("job_count_notified", static_cast<int>(notified_jobs_.size())); dict.Set("preconnect_count", static_cast<int>(preconnect_jobs_.size())); - dict.Set("tcp_based_attempt_count", static_cast<int>(TcpBasedAttemptCount())); - dict.Set("slow_tcp_based_attempt_count", - static_cast<int>(slow_tcp_based_attempt_count_)); + dict.Set("tcp_based_attempt_slot_count", + static_cast<int>(TcpBasedAttemptSlotCount())); dict.Set("availability_state", static_cast<int>(availability_state_)); if (final_error_to_notify_jobs_.has_value()) { dict.Set("final_error_to_notify_job", *final_error_to_notify_jobs_); @@ -902,19 +902,7 @@ static_cast<int>(tcp_based_attempt_delay_.InMilliseconds())); dict.Set("should_block_tcp_based_attempt", should_block_tcp_based_attempt_); - int service_endpoint_num_waiting_callbacks = 0; - if (!tcp_based_attempts_.empty()) { - base::Value::List tcp_based_attempts; - for (const auto& entry : tcp_based_attempts_) { - if (entry->IsWaitingForServiceEndpointReady()) { - ++service_endpoint_num_waiting_callbacks; - } - tcp_based_attempts.Append(entry->GetInfoAsValue()); - } - dict.Set("tcp_based_attempts", std::move(tcp_based_attempts)); - } - dict.Set("service_endpoint_num_waiting_callbacks", - service_endpoint_num_waiting_callbacks); + dict.Set("tcp_based_attempt_slots", GetTcpBasedAttemptSlotsAsValue()); base::Value::List ip_endpoint_states = ip_endpoint_state_tracker_.GetInfoAsValue(); @@ -950,16 +938,17 @@ dict.Set("num_jobs", static_cast<int>(request_jobs_.size())); dict.Set("num_notified_jobs", static_cast<int>(notified_jobs_.size())); dict.Set("num_preconnects", static_cast<int>(preconnect_jobs_.size())); - dict.Set("num_tcp_based_attempts", - static_cast<int>(tcp_based_attempts_.size())); - dict.Set("num_slow_attempts", - static_cast<int>(slow_tcp_based_attempt_count_)); + dict.Set("num_tcp_based_attempt_slots", + static_cast<int>(tcp_based_attempt_slots_.size())); dict.Set("enable_ip_based_pooling_for_h2", IsIpBasedPoolingEnabledForH2()); dict.Set("enable_alternative_services", IsAlternativeServiceEnabled()); dict.Set("quic_attempt_alive", !!quic_attempt_); if (quic_attempt_result_.has_value()) { dict.Set("quic_attempt_result", *quic_attempt_result_); } + + dict.Set("tcp_based_attempt_slots", GetTcpBasedAttemptSlotsAsValue()); + return dict; } @@ -1117,7 +1106,7 @@ HandleQuicSessionReady(quic_session, StreamSocketCloseReason::kUsingExistingQuicSession); - CHECK(tcp_based_attempts_.empty()); + CHECK(tcp_based_attempt_slots_.empty()); return; } @@ -1139,7 +1128,7 @@ HandleSpdySessionReady(spdy_session, StreamSocketCloseReason::kUsingExistingSpdySession); - CHECK(tcp_based_attempts_.empty()); + CHECK(tcp_based_attempt_slots_.empty()); return; } @@ -1226,11 +1215,8 @@ // Transferring callback ownership is important to avoid accessing TCP based // attempts that could be destroyed while invoking callbacks. std::vector<CompletionOnceCallback> callbacks; - for (const auto& attempt : tcp_based_attempts_) { - auto callback = attempt->MaybeTakeSSLConfigWaitingCallback(); - if (callback.has_value()) { - callbacks.emplace_back(std::move(*callback)); - } + for (const auto& slot : tcp_based_attempt_slots_) { + slot->MaybeTakeSSLConfigWaitingCallbacks(callbacks); } for (auto& callback : callbacks) { @@ -1296,7 +1282,8 @@ ip_endpoint_state_tracker_.GetIPEndPointToAttemptTcpBased( exclude_ip_endpoint); if (!ip_endpoint.has_value()) { - if (service_endpoint_request_finished_ && tcp_based_attempts_.empty()) { + if (service_endpoint_request_finished_ && + tcp_based_attempt_slots_.empty()) { tcp_based_attempt_state_ = TcpBasedAttemptState::kAllEndpointsFailed; } if (tcp_based_attempt_state_ == @@ -1316,14 +1303,7 @@ CHECK(!preconnect_jobs_.empty() || group_->IdleStreamSocketCount() == 0); - auto tcp_based_attempt = - std::make_unique<TcpBasedAttempt>(this, using_tls, *ip_endpoint); - auto [attempt_iterator, inserted] = - tcp_based_attempts_.emplace(std::move(tcp_based_attempt)); - CHECK(inserted); - pool()->IncrementTotalConnectingStreamCount(); - - (*attempt_iterator)->Start(); + CreateAndStartTcpBasedAttempt(using_tls, *ip_endpoint); ++num_attempts; if (max_attempts.has_value() && num_attempts >= *max_attempts) { @@ -1332,6 +1312,51 @@ } } +void HttpStreamPool::AttemptManager::CreateAndStartTcpBasedAttempt( + bool using_tls, + IPEndPoint ip_endpoint) { + TcpBasedAttemptSlot* slot = FindTcpBasedAttemptSlot(ip_endpoint); + auto attempt = std::make_unique<TcpBasedAttempt>(this, slot, using_tls, + std::move(ip_endpoint)); + TcpBasedAttempt* raw_attempt = attempt.get(); + slot->AllocateAttempt(std::move(attempt)); + raw_attempt->Start(); +} + +HttpStreamPool::TcpBasedAttemptSlot* +HttpStreamPool::AttemptManager::FindTcpBasedAttemptSlot( + const IPEndPoint& ip_endpoint) { + // Prefer a new slot if there is a room for it. + if (!ShouldRespectLimits() || tcp_based_attempt_slots_.size() < + pool()->max_stream_sockets_per_group()) { + auto slot = std::make_unique<TcpBasedAttemptSlot>(); + auto [it, inserted] = tcp_based_attempt_slots_.emplace(std::move(slot)); + CHECK(inserted); + pool()->IncrementTotalConnectingStreamCount(); + return it->get(); + } + + for (auto& slot : tcp_based_attempt_slots_) { + if (ip_endpoint.address().IsIPv4() && !slot->ipv4_attempt()) { + return slot.get(); + } + if (ip_endpoint.address().IsIPv6() && !slot->ipv6_attempt()) { + return slot.get(); + } + } + NOTREACHED(); +} + +void HttpStreamPool::AttemptManager::CancelTcpBasedAttemptSlot( + TcpBasedAttemptSlot* raw_slot, + std::optional<StreamSocketCloseReason> reason) { + std::unique_ptr<TcpBasedAttemptSlot> slot = + ExtractTcpBasedAttemptSlot(raw_slot); + if (reason.has_value()) { + slot->SetCancelReason(*reason); + } +} + bool HttpStreamPool::AttemptManager::IsTcpBasedAttemptReady() { CanAttemptResult can_attempt = CanAttemptConnection(); // TODO(crbug.com/383606724): Consider removing these trace and net log event @@ -1478,11 +1503,6 @@ return max_preconnect_count; } -size_t HttpStreamPool::AttemptManager::NonSlowTcpBasedAttemptCount() const { - CHECK_GE(tcp_based_attempts_.size(), slow_tcp_based_attempt_count_); - return tcp_based_attempts_.size() - slow_tcp_based_attempt_count_; -} - std::optional<QuicEndpoint> HttpStreamPool::AttemptManager::GetQuicEndpointToAttempt() { const bool svcb_optional = IsSvcbOptional(); @@ -1538,7 +1558,7 @@ NotifyPreconnectsComplete(final_error_to_notify_jobs()); NotifyJobOfFailure(); - CHECK(tcp_based_attempts_.empty()); + CHECK(tcp_based_attempt_slots_.empty()); CHECK(request_jobs_.empty()); CHECK(preconnect_jobs_.empty()); CHECK(!quic_attempt_); @@ -1863,10 +1883,8 @@ if (ShouldRespectLimits()) { while (group_->ActiveStreamSocketCount() > pool()->max_stream_sockets_per_group() && - !tcp_based_attempts_.empty()) { - std::unique_ptr<TcpBasedAttempt> attempt = - ExtractTcpBasedAttempt(tcp_based_attempts_.begin()->get()); - attempt.reset(); + !tcp_based_attempt_slots_.empty()) { + CancelTcpBasedAttemptSlot(tcp_based_attempt_slots_.begin()->get()); } } return job; @@ -1890,18 +1908,28 @@ MaybeChangeServiceEndpointRequestPriority(); } +std::unique_ptr<HttpStreamPool::TcpBasedAttemptSlot> +HttpStreamPool::AttemptManager::ExtractTcpBasedAttemptSlot( + TcpBasedAttemptSlot* raw_slot) { + auto it = tcp_based_attempt_slots_.find(raw_slot); + std::unique_ptr<TcpBasedAttemptSlot> slot = + std::move(tcp_based_attempt_slots_.extract(it).value()); + pool()->DecrementTotalConnectingStreamCount(); + return slot; +} + std::unique_ptr<HttpStreamPool::TcpBasedAttempt> HttpStreamPool::AttemptManager::ExtractTcpBasedAttempt( - TcpBasedAttempt* raw_attempt) { - auto it = tcp_based_attempts_.find(raw_attempt); - CHECK(it != tcp_based_attempts_.end()); - std::unique_ptr<TcpBasedAttempt> attempt = - std::move(tcp_based_attempts_.extract(it).value()); + TcpBasedAttempt* raw_attempt, + int rv) { + TcpBasedAttemptSlot* slot = raw_attempt->slot(); + auto it = tcp_based_attempt_slots_.find(slot); + CHECK(it != tcp_based_attempt_slots_.end()); - pool()->DecrementTotalConnectingStreamCount(); - if (attempt->is_slow()) { - CHECK_GT(slow_tcp_based_attempt_count_, 0u); - --slow_tcp_based_attempt_count_; + std::unique_ptr<TcpBasedAttempt> attempt = slot->TakeAttempt(raw_attempt); + + if (rv == OK || slot->empty()) { + ExtractTcpBasedAttemptSlot(slot); } return attempt; @@ -1921,7 +1949,7 @@ return; } - // We already removed `tcp_based_attempt` from `tcp_based_attempts_` so + // We already removed `tcp_based_attempt` from `tcp_based_attempt_slots_` so // the active stream count is up-to-date. ProcessPreconnectsAfterAttemptComplete(rv, group_->ActiveStreamSocketCount()); @@ -2070,9 +2098,25 @@ stream_key().network_anonymization_key()); } +base::Value::Dict +HttpStreamPool::AttemptManager::GetTcpBasedAttemptSlotsAsValue() const { + base::Value::Dict dict; + dict.Set("num_slots", static_cast<int>(tcp_based_attempt_slots_.size())); + + if (!tcp_based_attempt_slots_.empty()) { + base::Value::List slots; + for (const auto& slot : tcp_based_attempt_slots_) { + slots.Append(slot->GetInfoAsValue()); + } + dict.Set("slots", std::move(slots)); + } + + return dict; +} + bool HttpStreamPool::AttemptManager::CanComplete() const { return request_jobs_.empty() && notified_jobs_.empty() && - preconnect_jobs_.empty() && tcp_based_attempts_.empty() && + preconnect_jobs_.empty() && tcp_based_attempt_slots_.empty() && !quic_attempt_; }
diff --git a/net/http/http_stream_pool_attempt_manager.h b/net/http/http_stream_pool_attempt_manager.h index 577210b..2f4a395 100644 --- a/net/http/http_stream_pool_attempt_manager.h +++ b/net/http/http_stream_pool_attempt_manager.h
@@ -183,8 +183,14 @@ // or failure. size_t NotifiedRequestJobCount() const { return notified_jobs_.size(); } - // Returns the number of in-flight TCP based attempts. - size_t TcpBasedAttemptCount() const { return tcp_based_attempts_.size(); } + // Returns the number of in-flight TCP based attempt slots. + size_t TcpBasedAttemptSlotCount() const { + return tcp_based_attempt_slots_.size(); + } + + // Returns the number of TCP based attempt slots that are not considered as + // slow. + size_t NonSlowTcpBasedAttemptCount() const; // Cancels all in-flight TCP based attempts. void CancelTcpBasedAttempts(StreamSocketCloseReason reason); @@ -353,6 +359,19 @@ std::optional<IPEndPoint> exclude_ip_endpoint = std::nullopt, std::optional<size_t> max_attempts = std::nullopt); + // Creates and starts a TCP based attempt. + void CreateAndStartTcpBasedAttempt(bool using_tls, IPEndPoint ip_endpoint); + + // Finds or allocates a TcpBasedAttemptSlot for `ip_endpoint`. If under the + // group limit, allocates a new slot. Otherwise, uses an existing slot that + // doesn't have an attempt for the same address family as `ip_endpoint`. + TcpBasedAttemptSlot* FindTcpBasedAttemptSlot(const IPEndPoint& ip_endpoint); + + // Cancels `raw_slot` and removes it from `tcp_based_attempt_slots_`. + void CancelTcpBasedAttemptSlot( + TcpBasedAttemptSlot* raw_slot, + std::optional<StreamSocketCloseReason> reason = std::nullopt); + // Returns true if there are pending jobs and the pool and the group // haven't reached stream limits. If the pool reached the stream limit, may // close idle sockets in other groups. Also may cancel preconnects or trigger @@ -390,9 +409,6 @@ // preconnects. size_t CalculateRequiredTcpBasedAttemptForPreconnect() const; - // Returns the number of TCP based attempts that are not considered as slow. - size_t NonSlowTcpBasedAttemptCount() const; - // Returns a QUIC endpoint to make a connection attempt. See the comments in // QuicSessionPool::SelectQuicVersion() for the criteria to select a QUIC // endpoint. @@ -462,9 +478,15 @@ // limit. raw_ptr<Job> RemoveJobFromQueue(JobQueue::Pointer job_pointer); - // Transfers the ownership of `raw_attempt` to the caller. + // Transfers the ownership of `raw_slot` to the caller. + std::unique_ptr<TcpBasedAttemptSlot> ExtractTcpBasedAttemptSlot( + TcpBasedAttemptSlot* raw_slot); + + // Transfers the ownership of `raw_attempt` to the caller. If `rv` is OK, also + // removes the corresponding slot from `tcp_based_attempt_slots_`. std::unique_ptr<TcpBasedAttempt> ExtractTcpBasedAttempt( - TcpBasedAttempt* raw_attempt); + TcpBasedAttempt* raw_attempt, + int rv); void HandleTcpBasedAttemptFailure( std::unique_ptr<TcpBasedAttempt> tcp_based_attempt, @@ -495,6 +517,8 @@ // or not attempted. void MaybeMarkQuicBroken(); + base::Value::Dict GetTcpBasedAttemptSlotsAsValue() const; + // Returns true when this can complete. bool CanComplete() const; @@ -569,10 +593,8 @@ // from the newest job. std::optional<SSLConfig> base_ssl_config_; - std::set<std::unique_ptr<TcpBasedAttempt>, base::UniquePtrComparator> - tcp_based_attempts_; - // The number of in-flight TCP based attempts that are treated as slow. - size_t slow_tcp_based_attempt_count_ = 0; + std::set<std::unique_ptr<TcpBasedAttemptSlot>, base::UniquePtrComparator> + tcp_based_attempt_slots_; base::OneShotTimer spdy_throttle_timer_; bool spdy_throttle_delay_passed_ = false;
diff --git a/net/http/http_stream_pool_attempt_manager_unittest.cc b/net/http/http_stream_pool_attempt_manager_unittest.cc index e1287ae3..1b6df5e3 100644 --- a/net/http/http_stream_pool_attempt_manager_unittest.cc +++ b/net/http/http_stream_pool_attempt_manager_unittest.cc
@@ -1375,11 +1375,11 @@ RunUntilIdle(); AttemptManager* manager = pool().GetGroupForTesting(requester.GetStreamKey())->attempt_manager(); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); ASSERT_FALSE(request->completed()); FastForwardBy(HttpStreamPool::GetConnectionAttemptDelay()); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 2u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 2u); ASSERT_FALSE(request->completed()); // FastForwardBy() executes non-delayed tasks so the request finishes @@ -1402,6 +1402,65 @@ ASSERT_FALSE(requester.associated_attempt_manager()); } +TEST_F(HttpStreamPoolAttemptManagerTest, IPEndPointSlowMultipleRequests) { + constexpr size_t kMaxPerGroup = 2; + pool().set_max_stream_sockets_per_group_for_testing(kMaxPerGroup); + + base::WeakPtr<FakeServiceEndpointRequest> endpoint_request = + resolver()->AddFakeRequest(); + + // Data for blackholed endpoint (2001:db8::1). + std::vector<std::unique_ptr<SequencedSocketData>> datas; + for (size_t i = 0; i < kMaxPerGroup; ++i) { + auto data = std::make_unique<SequencedSocketData>(); + // Make the first attempt stalled. + data->set_connect_data(MockConnect(SYNCHRONOUS, ERR_IO_PENDING)); + socket_factory()->AddSocketDataProvider(data.get()); + datas.emplace_back(std::move(data)); + } + + // Data for successful endpoint (192.0.2.1). + for (size_t i = 0; i < kMaxPerGroup; ++i) { + auto data = std::make_unique<SequencedSocketData>(); + data->set_connect_data(MockConnect(ASYNC, OK)); + socket_factory()->AddSocketDataProvider(data.get()); + datas.emplace_back(std::move(data)); + } + + // Create requests up to the per-group limit. + std::vector<std::unique_ptr<StreamRequester>> requesters; + for (size_t i = 0; i < kMaxPerGroup; ++i) { + auto requester = std::make_unique<StreamRequester>(); + HttpStreamRequest* request = requester->RequestStream(pool()); + requesters.emplace_back(std::move(requester)); + ASSERT_FALSE(request->completed()); + } + + // Complete endpoint resolution with IPv4/IPv6 endpoints. This triggers + // `kMaxPerGroup` attempts for the IPv6 endpoint. + endpoint_request + ->add_endpoint(ServiceEndpointBuilder() + .add_v4("192.0.2.1") + .add_v6("2001:db8::1") + .endpoint()) + .CallOnServiceEndpointRequestFinished(OK); + + AttemptManager* manager = + pool() + .GetGroupForTesting(requesters[0]->GetStreamKey()) + ->attempt_manager(); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 2u); + + // Simulate IPv6 endpoint slow. It should trigger attempts for the IPv4 + // endpoint. FastForwardBy() executes non-delayed tasks so the requests finish + // immediately. + FastForwardBy(HttpStreamPool::GetConnectionAttemptDelay()); + for (const auto& requester : requesters) { + ASSERT_TRUE(requester->result().has_value()); + EXPECT_THAT(requester->result(), Optional(IsOk())); + } +} + TEST_F(HttpStreamPoolAttemptManagerTest, PauseSlowTimerAfterTcpHandshakeForTls) { base::WeakPtr<FakeServiceEndpointRequest> endpoint_request = @@ -1437,7 +1496,7 @@ pool() .GetOrCreateGroupForTesting(requester.GetStreamKey()) .attempt_manager(); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); ASSERT_FALSE(requester.result().has_value()); // Complete TCP handshake after a delay that is less than the connection @@ -1447,24 +1506,24 @@ FastForwardBy(kTcpDelay); tcp_connect_completer1.Complete(OK); RunUntilIdle(); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); // Fast-forward to the connection attempt delay. Since the in-flight attempt // has completed TCP handshake and is waiting for HTTPS RR, the manager // shouldn't start another attempt. FastForwardBy(HttpStreamPool::GetConnectionAttemptDelay()); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); // Complete DNS resolution fully. endpoint_request->set_crypto_ready(true).CallOnServiceEndpointRequestFinished( OK); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); // Fast-forward to the connection attempt delay again. This time the in-flight // attempt is still doing TLS handshake, it's treated as slow and the manager // should start another attempt. FastForwardBy(HttpStreamPool::GetConnectionAttemptDelay()); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 2u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 2u); // Complete the second attempt. The request should finish successfully. tcp_connect_completer2.Complete(OK); @@ -1603,7 +1662,7 @@ AttemptManager* manager = group.attempt_manager(); ASSERT_EQ(pool().TotalActiveStreamCount(), kMaxPerGroup); ASSERT_EQ(group.ActiveStreamSocketCount(), kMaxPerGroup); - ASSERT_EQ(manager->TcpBasedAttemptCount(), kMaxPerGroup); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), kMaxPerGroup); // This request should not start an attempt as the group reached its limit. StreamRequester stalled_requester; @@ -1615,7 +1674,7 @@ ASSERT_EQ(pool().TotalActiveStreamCount(), kMaxPerGroup); ASSERT_EQ(group.ActiveStreamSocketCount(), kMaxPerGroup); - ASSERT_EQ(manager->TcpBasedAttemptCount(), kMaxPerGroup); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), kMaxPerGroup); ASSERT_EQ(stalled_request->GetLoadState(), LOAD_STATE_WAITING_FOR_AVAILABLE_SOCKET); @@ -1623,7 +1682,7 @@ RunUntilIdle(); ASSERT_EQ(pool().TotalActiveStreamCount(), kMaxPerGroup); ASSERT_EQ(group.ActiveStreamSocketCount(), kMaxPerGroup); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 0u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 0u); // Release one HttpStream and close it to make non-reusable. std::unique_ptr<StreamRequester> released_requester = @@ -1647,13 +1706,13 @@ ASSERT_EQ(pool().TotalActiveStreamCount(), kMaxPerGroup); ASSERT_EQ(group.ActiveStreamSocketCount(), kMaxPerGroup); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); RunUntilIdle(); ASSERT_EQ(pool().TotalActiveStreamCount(), kMaxPerGroup); ASSERT_EQ(group.ActiveStreamSocketCount(), kMaxPerGroup); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 0u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 0u); ASSERT_TRUE(stalled_request->completed()); std::unique_ptr<HttpStream> stream = stalled_requester.ReleaseStream(); ASSERT_TRUE(stream); @@ -1729,7 +1788,7 @@ ASSERT_FALSE(request2->completed()); ASSERT_TRUE(pool().ReachedMaxStreamLimit()); ASSERT_TRUE(pool().IsPoolStalled()); - ASSERT_EQ(requester2.associated_attempt_manager()->TcpBasedAttemptCount(), + ASSERT_EQ(requester2.associated_attempt_manager()->TcpBasedAttemptSlotCount(), 0u); // Release one HttpStream from group A. It should unblock the in-flight @@ -2022,7 +2081,7 @@ } Group& group = pool().GetOrCreateGroupForTesting(stream_key); - ASSERT_GT(group.attempt_manager()->TcpBasedAttemptCount(), kMaxPerGroup); + ASSERT_GT(group.attempt_manager()->TcpBasedAttemptSlotCount(), kMaxPerGroup); // Complete requests that ignore limits. while (!limit_ignoring_requesters.empty()) { @@ -2268,16 +2327,16 @@ .GetOrCreateGroupForTesting(requester2.GetStreamKey()) .attempt_manager(); ASSERT_EQ(manager1->RequestJobCount(), 1u); - ASSERT_EQ(manager1->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager1->TcpBasedAttemptSlotCount(), 1u); ASSERT_EQ(manager2->RequestJobCount(), 1u); - ASSERT_EQ(manager2->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager2->TcpBasedAttemptSlotCount(), 1u); NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); RunUntilIdle(); ASSERT_EQ(manager1->RequestJobCount(), 0u); - ASSERT_EQ(manager1->TcpBasedAttemptCount(), 0u); + ASSERT_EQ(manager1->TcpBasedAttemptSlotCount(), 0u); ASSERT_EQ(manager2->RequestJobCount(), 0u); - ASSERT_EQ(manager2->TcpBasedAttemptCount(), 0u); + ASSERT_EQ(manager2->TcpBasedAttemptSlotCount(), 0u); EXPECT_THAT(requester1.result(), Optional(IsError(ERR_NETWORK_CHANGED))); EXPECT_THAT(requester2.result(), Optional(IsError(ERR_NETWORK_CHANGED))); } @@ -2389,7 +2448,7 @@ ->GetWeakPtrForTesting(); ASSERT_EQ(manager->RequestJobCount(), 2u); ASSERT_EQ(manager->NotifiedRequestJobCount(), 0u); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 2u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 2u); // Trigger slow timers. FastForwardBy(HttpStreamPool::GetConnectionAttemptDelay()); @@ -2403,7 +2462,7 @@ ASSERT_TRUE(manager->is_shutting_down()); ASSERT_EQ(manager->RequestJobCount(), 0u); ASSERT_EQ(manager->NotifiedRequestJobCount(), 0u); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 0u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 0u); // Trigger an SSLConfig change. This should cancel in-flight attempts. ssl_config_service()->NotifySSLContextConfigChange(); @@ -3322,7 +3381,7 @@ .CallOnServiceEndpointRequestFinished(OK); // There should be only one in-flight attempt because attempts are throttled. Group& group = pool().GetOrCreateGroupForTesting(requester1.GetStreamKey()); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), 1u); // This should not enter an infinite loop. pool().ProcessPendingRequestsInGroups(); @@ -3429,14 +3488,14 @@ .CallOnServiceEndpointRequestFinished(OK); // There should be only one in-flight attempt because attempts are throttled. Group& group = pool().GetOrCreateGroupForTesting(requester1.GetStreamKey()); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), 1u); FastForwardBy(AttemptManager::kSpdyThrottleDelay); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), 2u); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), 2u); connect_completer1.Complete(OK); RunUntilIdle(); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), 1u); connect_completer2.Complete(OK); RunUntilIdle(); @@ -3488,14 +3547,14 @@ AttemptManager* manager = pool().GetGroupForTesting(requester.GetStreamKey())->attempt_manager(); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); ASSERT_FALSE(requester.result().has_value()); // Fast-forward to the connection attempt delay. The in-flight attempt is // treated as slow. Since there is no non-slow attempt, the manager should // not be throttled and start another attempt. FastForwardBy(HttpStreamPool::GetConnectionAttemptDelay()); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 2u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 2u); // Complete the second attempt. The request should finish successfully. completer2.Complete(OK); @@ -3568,7 +3627,7 @@ ->add_endpoint(ServiceEndpointBuilder().add_v4("192.0.2.1").endpoint()) .CallOnServiceEndpointRequestFinished(OK); Group& group = pool().GetOrCreateGroupForTesting(preconnector.GetStreamKey()); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), 1u); ASSERT_FALSE(preconnector.result().has_value()); RunUntilIdle(); @@ -3598,7 +3657,7 @@ ->add_endpoint(ServiceEndpointBuilder().add_v4("192.0.2.1").endpoint()) .CallOnServiceEndpointRequestFinished(OK); Group& group = pool().GetOrCreateGroupForTesting(preconnector.GetStreamKey()); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), kNumStreams); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), kNumStreams); ASSERT_FALSE(preconnector.result().has_value()); RunUntilIdle(); @@ -3644,7 +3703,7 @@ int rv = preconnector.set_num_streams(kNumPreconnectStreams).Preconnect(pool()); EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), kNumPreconnectStreams - 1u); ASSERT_FALSE(preconnector.result().has_value()); @@ -3681,7 +3740,7 @@ ->add_endpoint(ServiceEndpointBuilder().add_v4("192.0.2.1").endpoint()) .CallOnServiceEndpointRequestFinished(OK); Group& group = pool().GetOrCreateGroupForTesting(preconnector.GetStreamKey()); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), 1u); ASSERT_FALSE(preconnector.result().has_value()); RunUntilIdle(); @@ -3725,7 +3784,7 @@ ->add_endpoint(ServiceEndpointBuilder().add_v4("192.0.2.1").endpoint()) .CallOnServiceEndpointRequestFinished(OK); Group& group = pool().GetOrCreateGroupForTesting(preconnector.GetStreamKey()); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), 2u); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), 2u); ASSERT_FALSE(preconnector.result().has_value()); RunUntilIdle(); @@ -3762,7 +3821,7 @@ ->add_endpoint(ServiceEndpointBuilder().add_v4("192.0.2.1").endpoint()) .CallOnServiceEndpointRequestFinished(OK); Group& group = pool().GetOrCreateGroupForTesting(preconnector.GetStreamKey()); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), kNumStreams); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), kNumStreams); ASSERT_FALSE(preconnector.result().has_value()); preconnector.WaitForResult(); @@ -3800,7 +3859,7 @@ ->add_endpoint(ServiceEndpointBuilder().add_v4("192.0.2.1").endpoint()) .CallOnServiceEndpointRequestFinished(OK); Group& group = pool().GetOrCreateGroupForTesting(preconnector.GetStreamKey()); - ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptCount(), kNumStreams); + ASSERT_EQ(group.attempt_manager()->TcpBasedAttemptSlotCount(), kNumStreams); ASSERT_FALSE(preconnector.result().has_value()); RunUntilIdle(); @@ -3960,7 +4019,7 @@ ASSERT_FALSE(requester2.result().has_value()); ASSERT_NE(requester1.associated_attempt_manager().get(), group->attempt_manager()); - ASSERT_EQ(group->attempt_manager()->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(group->attempt_manager()->TcpBasedAttemptSlotCount(), 1u); EXPECT_EQ(request2->GetLoadState(), LOAD_STATE_CONNECTING); // Preconnect should succeed immediately as the active AttemptManager has @@ -5596,7 +5655,7 @@ endpoint_request->CallOnServiceEndpointRequestFinished(OK); ASSERT_FALSE(requester.result().has_value()); ASSERT_TRUE(manager->quic_attempt_for_testing()); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 1u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); // The request should complete with the TCP-based attempt. requester.WaitForResult(); @@ -5659,7 +5718,7 @@ endpoint_request->CallOnServiceEndpointRequestFinished(OK); ASSERT_FALSE(requester.result().has_value()); ASSERT_TRUE(manager->quic_attempt_for_testing()); - ASSERT_EQ(manager->TcpBasedAttemptCount(), 0u); + ASSERT_EQ(manager->TcpBasedAttemptSlotCount(), 0u); // Fire the stream attempt delay timer. The request should complete. FastForwardBy(kQuicDelay); @@ -5727,7 +5786,7 @@ EXPECT_FALSE(manager->quic_attempt_for_testing()); EXPECT_THAT(manager->GetQuicAttemptResultForTesting(), Optional(IsError(ERR_DNS_NO_MATCHING_SUPPORTED_ALPN))); - EXPECT_EQ(manager->TcpBasedAttemptCount(), 1u); + EXPECT_EQ(manager->TcpBasedAttemptSlotCount(), 1u); connect_completer.Complete(OK); preconnector.WaitForResult(); @@ -7235,8 +7294,8 @@ EXPECT_THAT(requester.result(), Optional(IsError(ERR_NETWORK_CHANGED))); // The group should not have active AttemptManager. EXPECT_FALSE(group->attempt_manager()); - EXPECT_THAT(requester.associated_attempt_manager()->TcpBasedAttemptCount(), - 0u); + EXPECT_THAT( + requester.associated_attempt_manager()->TcpBasedAttemptSlotCount(), 0u); EXPECT_THAT( requester.associated_attempt_manager()->GetQuicAttemptResultForTesting(), Optional(IsError(ERR_NETWORK_CHANGED))); @@ -7288,8 +7347,8 @@ requester.WaitForResult(); EXPECT_THAT(requester.result(), Optional(IsError(ERR_NAME_NOT_RESOLVED))); - EXPECT_THAT(requester.associated_attempt_manager()->TcpBasedAttemptCount(), - 0u); + EXPECT_THAT( + requester.associated_attempt_manager()->TcpBasedAttemptSlotCount(), 0u); EXPECT_THAT( requester.associated_attempt_manager()->GetQuicAttemptResultForTesting(), Optional(IsError(ERR_NAME_NOT_RESOLVED))); @@ -7330,8 +7389,8 @@ EXPECT_THAT(requester.result(), Optional(IsError(ERR_SSL_CLIENT_AUTH_CERT_NEEDED))); quic_completer.Complete(OK); - EXPECT_THAT(requester.associated_attempt_manager()->TcpBasedAttemptCount(), - 0u); + EXPECT_THAT( + requester.associated_attempt_manager()->TcpBasedAttemptSlotCount(), 0u); EXPECT_THAT( requester.associated_attempt_manager()->GetQuicAttemptResultForTesting(), Optional(IsError(ERR_SSL_CLIENT_AUTH_CERT_NEEDED))); @@ -7367,8 +7426,8 @@ requester.WaitForResult(); EXPECT_THAT(requester.result(), Optional(IsError(ERR_CERT_DATE_INVALID))); quic_completer.Complete(OK); - EXPECT_THAT(requester.associated_attempt_manager()->TcpBasedAttemptCount(), - 0u); + EXPECT_THAT( + requester.associated_attempt_manager()->TcpBasedAttemptSlotCount(), 0u); EXPECT_THAT( requester.associated_attempt_manager()->GetQuicAttemptResultForTesting(), Optional(IsError(ERR_CERT_DATE_INVALID)));
diff --git a/net/http/http_stream_pool_group.cc b/net/http/http_stream_pool_group.cc index 2ce7086..777b138 100644 --- a/net/http/http_stream_pool_group.cc +++ b/net/http/http_stream_pool_group.cc
@@ -264,12 +264,13 @@ } size_t HttpStreamPool::Group::ConnectingStreamSocketCount() const { - return attempt_manager_ ? attempt_manager_->TcpBasedAttemptCount() : 0; + return attempt_manager_ ? attempt_manager_->TcpBasedAttemptSlotCount() : 0; } size_t HttpStreamPool::Group::ActiveStreamSocketCount() const { return handed_out_stream_count_ + idle_stream_sockets_.size() + - ConnectingStreamSocketCount(); + (attempt_manager_ ? attempt_manager_->NonSlowTcpBasedAttemptCount() + : 0); } bool HttpStreamPool::Group::ReachedMaxStreamLimit() const {
diff --git a/net/http/http_stream_pool_tcp_based_attempt.cc b/net/http/http_stream_pool_tcp_based_attempt.cc index 76933dc..8535ffb 100644 --- a/net/http/http_stream_pool_tcp_based_attempt.cc +++ b/net/http/http_stream_pool_tcp_based_attempt.cc
@@ -9,6 +9,7 @@ #include <string_view> #include "base/metrics/histogram_functions.h" +#include "base/notreached.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h" #include "base/timer/timer.h" @@ -75,12 +76,14 @@ } // namespace HttpStreamPool::TcpBasedAttempt::TcpBasedAttempt(AttemptManager* manager, + TcpBasedAttemptSlot* slot, bool using_tls, IPEndPoint ip_endpoint) : manager_(manager), track_(base::trace_event::GetNextGlobalTraceId()), flow_(perfetto::Flow::ProcessScoped( - base::trace_event::GetNextGlobalTraceId())) { + base::trace_event::GetNextGlobalTraceId())), + slot_(slot) { TRACE_EVENT_INSTANT("net.stream", "TcpBasedAttemptStart", manager_->track(), flow_); TRACE_EVENT_BEGIN("net.stream", "TcpBasedAttempt::TcpBasedAttempt", track_, @@ -272,4 +275,126 @@ manager_->OnTcpBasedAttemptComplete(this, rv); } +// TcpBasedAttemptSlot + +HttpStreamPool::TcpBasedAttemptSlot::TcpBasedAttemptSlot() = default; + +HttpStreamPool::TcpBasedAttemptSlot::~TcpBasedAttemptSlot() = default; + +HttpStreamPool::TcpBasedAttemptSlot::TcpBasedAttemptSlot( + TcpBasedAttemptSlot&&) = default; + +HttpStreamPool::TcpBasedAttemptSlot& +HttpStreamPool::TcpBasedAttemptSlot::operator=(TcpBasedAttemptSlot&&) = default; + +void HttpStreamPool::TcpBasedAttemptSlot::AllocateAttempt( + std::unique_ptr<TcpBasedAttempt> attempt) { + if (attempt->ip_endpoint().address().IsIPv4()) { + CHECK(!ipv4_attempt_); + ipv4_attempt_ = std::move(attempt); + } else { + CHECK(attempt->ip_endpoint().address().IsIPv6()); + CHECK(!ipv6_attempt_); + ipv6_attempt_ = std::move(attempt); + } +} + +std::unique_ptr<HttpStreamPool::TcpBasedAttempt> +HttpStreamPool::TcpBasedAttemptSlot::TakeAttempt(TcpBasedAttempt* raw_attempt) { + auto take_attempt = [&]() { + if (ipv4_attempt_.get() == raw_attempt) { + return std::move(ipv4_attempt_); + } + if (ipv6_attempt_.get() == raw_attempt) { + return std::move(ipv6_attempt_); + } + NOTREACHED(); + }; + + std::unique_ptr<TcpBasedAttempt> attempt = take_attempt(); + // Reset slot to avoid dangling pointer. + attempt->ResetSlot(); + return attempt; +} + +LoadState HttpStreamPool::TcpBasedAttemptSlot::GetLoadState() const { + if (ipv4_attempt_ && ipv6_attempt_) { + CHECK(ipv4_attempt_->attempt()); + CHECK(ipv6_attempt_->attempt()); + return std::max(ipv4_attempt_->attempt()->GetLoadState(), + ipv6_attempt_->attempt()->GetLoadState()); + } + if (ipv4_attempt_) { + CHECK(ipv4_attempt_->attempt()); + return ipv4_attempt_->attempt()->GetLoadState(); + } + if (ipv6_attempt_) { + CHECK(ipv6_attempt_->attempt()); + return ipv6_attempt_->attempt()->GetLoadState(); + } + NOTREACHED(); +} + +void HttpStreamPool::TcpBasedAttemptSlot::MaybeTakeSSLConfigWaitingCallbacks( + std::vector<CompletionOnceCallback>& callbacks) { + auto take_callback = [&](TcpBasedAttempt* attempt) { + auto callback = attempt->MaybeTakeSSLConfigWaitingCallback(); + if (callback.has_value()) { + callbacks.emplace_back(std::move(*callback)); + } + }; + + if (ipv4_attempt_) { + take_callback(ipv4_attempt_.get()); + } + if (ipv6_attempt_) { + take_callback(ipv6_attempt_.get()); + } +} + +bool HttpStreamPool::TcpBasedAttemptSlot::IsSlow() const { + if (ipv4_attempt_ && ipv6_attempt_) { + return ipv4_attempt_->is_slow() && ipv6_attempt_->is_slow(); + } + if (ipv4_attempt_) { + return ipv4_attempt_->is_slow(); + } + if (ipv6_attempt_) { + return ipv6_attempt_->is_slow(); + } + NOTREACHED(); +} + +bool HttpStreamPool::TcpBasedAttemptSlot::HasIPEndPoint( + const IPEndPoint& ip_endpoint) const { + if (ipv4_attempt_ && ipv4_attempt_->ip_endpoint() == ip_endpoint) { + return true; + } + if (ipv6_attempt_ && ipv6_attempt_->ip_endpoint() == ip_endpoint) { + return true; + } + return false; +} + +void HttpStreamPool::TcpBasedAttemptSlot::SetCancelReason( + StreamSocketCloseReason reason) { + if (ipv4_attempt_) { + ipv4_attempt_->SetCancelReason(reason); + } + if (ipv6_attempt_) { + ipv6_attempt_->SetCancelReason(reason); + } +} + +base::Value::Dict HttpStreamPool::TcpBasedAttemptSlot::GetInfoAsValue() const { + base::Value::Dict dict; + if (ipv4_attempt_) { + dict.Set("ipv4_attempt", ipv4_attempt_->GetInfoAsValue()); + } + if (ipv6_attempt_) { + dict.Set("ipv6_attempt", ipv6_attempt_->GetInfoAsValue()); + } + return dict; +} + } // namespace net
diff --git a/net/http/http_stream_pool_tcp_based_attempt.h b/net/http/http_stream_pool_tcp_based_attempt.h index 6db3fa0..200aa3c 100644 --- a/net/http/http_stream_pool_tcp_based_attempt.h +++ b/net/http/http_stream_pool_tcp_based_attempt.h
@@ -26,6 +26,7 @@ class HttpStreamPool::TcpBasedAttempt : public TlsStreamAttempt::Delegate { public: TcpBasedAttempt(AttemptManager* manager, + TcpBasedAttemptSlot* slot, bool using_tls, IPEndPoint ip_endpoint); @@ -38,6 +39,10 @@ void SetCancelReason(StreamSocketCloseReason reason); + TcpBasedAttemptSlot* slot() const { return slot_; } + + void ResetSlot() { slot_ = nullptr; } + StreamAttempt* attempt() { return attempt_.get(); } base::TimeTicks start_time() const { return start_time_; } @@ -76,6 +81,7 @@ const raw_ptr<AttemptManager> manager_; const perfetto::Track track_; const perfetto::Flow flow_; + raw_ptr<TcpBasedAttemptSlot> slot_; std::unique_ptr<StreamAttempt> attempt_; base::TimeTicks start_time_; std::optional<int> result_; @@ -94,6 +100,63 @@ base::WeakPtrFactory<TcpBasedAttempt> weak_ptr_factory_{this}; }; +// Groups at most two concurrent TCP-based attempts (one IPv4, one IPv6) into a +// single “slot” counted against pool limits. Used to work around cases where +// both address families are available but one is much slower than the other. In +// such cases, the slow attempt may time out, causing the whole pool to stall, +// even if the fast attempt would have succeeded. By grouping attempts by +// address family, we can ensure that at most one attempt per address family is +// in-flight at any time. +// TODO(crbug.com/383606724): Figure out a better solution by improving endpoint +// selection. +class HttpStreamPool::TcpBasedAttemptSlot { + public: + TcpBasedAttemptSlot(); + ~TcpBasedAttemptSlot(); + + TcpBasedAttemptSlot(const TcpBasedAttemptSlot&) = delete; + TcpBasedAttemptSlot& operator=(const TcpBasedAttemptSlot&) = delete; + TcpBasedAttemptSlot(TcpBasedAttemptSlot&&); + TcpBasedAttemptSlot& operator=(TcpBasedAttemptSlot&&); + + // Allocates `attempt` to either IPv4 or IPv6 attempt slot based on its IP + // address. + void AllocateAttempt(std::unique_ptr<TcpBasedAttempt> attempt); + + // Transfers ownership of the attempt matching `raw_attempt` to the caller. + std::unique_ptr<TcpBasedAttempt> TakeAttempt(TcpBasedAttempt* raw_attempt); + + TcpBasedAttempt* ipv4_attempt() const { return ipv4_attempt_.get(); } + TcpBasedAttempt* ipv6_attempt() const { return ipv6_attempt_.get(); } + + // Returns true if this slot has no attempts. + bool empty() const { return !ipv4_attempt() && !ipv6_attempt(); } + + // Returns the most advanced load state of the attempts in this slot. + LoadState GetLoadState() const; + + // Transfers SSLConfig waiting callbacks from attempts in this slot to + // `callbacks`, if attempts are waiting for SSLConfig. + void MaybeTakeSSLConfigWaitingCallbacks( + std::vector<CompletionOnceCallback>& callbacks); + + // Returns true when this slot is slow. A slot is considered slow when either + // IPv4 or IPv6 attempt is slow. + bool IsSlow() const; + + // Returns true if either IPv4 or IPv6 attempt has the given `ip_endpoint`. + bool HasIPEndPoint(const IPEndPoint& ip_endpoint) const; + + // Sets the cancel reason of both attempts in this slot. + void SetCancelReason(StreamSocketCloseReason reason); + + base::Value::Dict GetInfoAsValue() const; + + private: + std::unique_ptr<TcpBasedAttempt> ipv4_attempt_; + std::unique_ptr<TcpBasedAttempt> ipv6_attempt_; +}; + } // namespace net #endif // NET_HTTP_HTTP_STREAM_POOL_TCP_BASED_ATTEMPT_H_
diff --git a/pdf/pdfium/pdfium_engine_unittest.cc b/pdf/pdfium/pdfium_engine_unittest.cc index 636138b..b9998c0 100644 --- a/pdf/pdfium/pdfium_engine_unittest.cc +++ b/pdf/pdfium/pdfium_engine_unittest.cc
@@ -2962,44 +2962,52 @@ {{features::kPdfInk2TextHighlighting.name, "true"}}); } + void TearDown() override { + // Reset `engine_` before PDFium gets uninitialized. + engine_.reset(); + PDFiumDrawSelectionTestBase::TearDown(); + } + + [[nodiscard]] PDFiumEngine* CreateEngine( + const base::FilePath::CharType* test_filename) { + engine_ = InitializeEngine(&client_, test_filename); + if (engine_) { + // Plugin size chosen so all pages of the document are visible. + engine_->PluginSizeUpdated({1024, 4096}); + engine_->SetCaretBrowsingEnabled(true); + } + return engine_.get(); + } + private: base::test::ScopedFeatureList feature_list_; + std::unique_ptr<PDFiumEngine> engine_; + TestClient client_; }; TEST_P(PDFiumEngineCaretTest, SetCaretBrowsingEnabled) { - TestClient client; - std::unique_ptr<PDFiumEngine> engine = - InitializeEngine(&client, FILE_PATH_LITERAL("hello_world2.pdf")); + PDFiumEngine* engine = CreateEngine(FILE_PATH_LITERAL("hello_world2.pdf")); ASSERT_TRUE(engine); - engine->PluginSizeUpdated({500, 500}); + DrawCaretAndCompareWithPlatformExpectations(*engine, /*page_index=*/0, + "hello_world_caret.png"); + + engine->SetCaretBrowsingEnabled(false); constexpr gfx::Size kHelloWorldExpectedVisiblePageSize{266, 266}; DrawCaretAndExpectBlank(*engine, /*page_index=*/0, kHelloWorldExpectedVisiblePageSize); - engine->SetCaretBrowsingEnabled(false); - DrawCaretAndExpectBlank(*engine, /*page_index=*/0, - kHelloWorldExpectedVisiblePageSize); - engine->SetCaretBrowsingEnabled(true); + DrawCaretAndCompareWithPlatformExpectations(*engine, /*page_index=*/0, "hello_world_caret.png"); - - engine->SetCaretBrowsingEnabled(false); - DrawCaretAndExpectBlank(*engine, /*page_index=*/0, - kHelloWorldExpectedVisiblePageSize); } TEST_P(PDFiumEngineCaretTest, DrawOnGeometryChange) { - TestClient client; - std::unique_ptr<PDFiumEngine> engine = - InitializeEngine(&client, FILE_PATH_LITERAL("hello_world2.pdf")); + PDFiumEngine* engine = CreateEngine(FILE_PATH_LITERAL("hello_world2.pdf")); ASSERT_TRUE(engine); - engine->SetCaretBrowsingEnabled(true); - engine->PluginSizeUpdated({500, 500}); - engine->ScrolledToXPosition(20); DrawCaretAndCompareWithPlatformExpectations( @@ -3012,14 +3020,9 @@ } TEST_P(PDFiumEngineCaretTest, TextClick) { - NiceMock<MockTestClient> client; - std::unique_ptr<PDFiumEngine> engine = - InitializeEngine(&client, FILE_PATH_LITERAL("hello_world2.pdf")); + PDFiumEngine* engine = CreateEngine(FILE_PATH_LITERAL("hello_world2.pdf")); ASSERT_TRUE(engine); - engine->SetCaretBrowsingEnabled(true); - engine->PluginSizeUpdated({500, 500}); - // The "b" in "Goodbye, world!". EXPECT_TRUE(engine->HandleInputEvent( CreateLeftClickWebMouseEventAtPosition(gfx::PointF(85, 118)))); @@ -3036,14 +3039,10 @@ } TEST_P(PDFiumEngineCaretTest, TextClickSyntheticWhitespace) { - NiceMock<MockTestClient> client; - std::unique_ptr<PDFiumEngine> engine = InitializeEngine( - &client, FILE_PATH_LITERAL("text_synthetic_whitespace.pdf")); + PDFiumEngine* engine = + CreateEngine(FILE_PATH_LITERAL("text_synthetic_whitespace.pdf")); ASSERT_TRUE(engine); - engine->SetCaretBrowsingEnabled(true); - engine->PluginSizeUpdated({500, 500}); - // The synthetic whitespace with an empty screen rect. EXPECT_TRUE(engine->HandleInputEvent( CreateLeftClickWebMouseEventAtPosition(gfx::PointF(102, 130)))); @@ -3053,15 +3052,10 @@ } TEST_P(PDFiumEngineCaretTest, TextClickMultiPage) { - NiceMock<MockTestClient> client; - std::unique_ptr<PDFiumEngine> engine = InitializeEngine( - &client, FILE_PATH_LITERAL("multi_page_hello_world_with_empty_page.pdf")); + PDFiumEngine* engine = CreateEngine( + FILE_PATH_LITERAL("multi_page_hello_world_with_empty_page.pdf")); ASSERT_TRUE(engine); - engine->SetCaretBrowsingEnabled(true); - // Plugin size chosen so all pages of the document are visible. - engine->PluginSizeUpdated({1024, 4096}); - // First page. The first "l" in "Hello, world!". EXPECT_TRUE(engine->HandleInputEvent( CreateLeftClickWebMouseEventAtPosition(gfx::PointF(52, 190)))); @@ -3078,14 +3072,9 @@ } TEST_P(PDFiumEngineCaretTest, TextSelectAndMove) { - NiceMock<MockTestClient> client; - std::unique_ptr<PDFiumEngine> engine = - InitializeEngine(&client, FILE_PATH_LITERAL("hello_world2.pdf")); + PDFiumEngine* engine = CreateEngine(FILE_PATH_LITERAL("hello_world2.pdf")); ASSERT_TRUE(engine); - engine->SetCaretBrowsingEnabled(true); - engine->PluginSizeUpdated({500, 500}); - engine->OnTextOrLinkAreaClick(kHelloWorldStartPosition, /*click_count=*/1); DrawCaretAndCompareWithPlatformExpectations(*engine, /*page_index=*/0,
diff --git a/sandbox/linux/system_headers/linux_syscalls.h b/sandbox/linux/system_headers/linux_syscalls.h index 438147b..450fe3b 100644 --- a/sandbox/linux/system_headers/linux_syscalls.h +++ b/sandbox/linux/system_headers/linux_syscalls.h
@@ -9,6 +9,15 @@ #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ +// It is unsafe to include this file before sys/syscall.h when clang modules +// are enabled. This is because it goes: +// 1) Compile sys/syscalls.h, it exports __NR_stat64 +// 2) include this file. We check for #if defined(__NR_stat64), and because it +// isn't yet available, we define it. +// 3) Include sys/syscalls.h, which exports a second copy of __NR_stat64 +// This now results in an ambiguous definition error. +#include <sys/syscall.h> + #include "build/build_config.h" #if defined(__x86_64__) @@ -36,4 +45,3 @@ #endif #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ -
diff --git a/services/network/network_context.cc b/services/network/network_context.cc index 675ad02b..ec828e8 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc
@@ -2706,7 +2706,8 @@ auto* mdl_manager = network_service_->masked_domain_list_manager(); auto* prt_registry = network_service_->probabilistic_reveal_token_registry(); bool requires_ipp_proxy_delegate = - mdl_manager->IsEnabled() && + (mdl_manager->IsEnabled() || + !net::features::kIpPrivacyUnconditionalProxyDomainList.Get().empty()) && (params_->ip_protection_core_host || net::features::kIpPrivacyAlwaysCreateCore.Get()); if (requires_ipp_proxy_delegate) {
diff --git a/services/video_capture/BUILD.gn b/services/video_capture/BUILD.gn index 635b91e..0c380b18 100644 --- a/services/video_capture/BUILD.gn +++ b/services/video_capture/BUILD.gn
@@ -48,15 +48,12 @@ "//services/video_capture/public/cpp", "//services/video_capture/public/mojom", "//services/video_capture/public/mojom:constants", - "//services/video_effects/buildflags", - "//services/video_effects/public/mojom", "//services/viz/public/cpp/gpu", ] deps = [ "//media/capture:capture_lib", "//media/capture:capture_switches", - "//services/video_effects/buildflags", ] if (is_chromeos) {
diff --git a/services/video_capture/DEPS b/services/video_capture/DEPS index cdc281c..0565dd2 100644 --- a/services/video_capture/DEPS +++ b/services/video_capture/DEPS
@@ -8,6 +8,5 @@ "+media/capture", "+media/media_buildflags.h", "+ui/gfx", - "+services/video_effects/public", "+services/viz/public/cpp/gpu", ]
diff --git a/services/video_capture/device.h b/services/video_capture/device.h index de56f5d..b88f6ab 100644 --- a/services/video_capture/device.h +++ b/services/video_capture/device.h
@@ -5,7 +5,7 @@ #ifndef SERVICES_VIDEO_CAPTURE_DEVICE_H_ #define SERVICES_VIDEO_CAPTURE_DEVICE_H_ -#include "media/capture/video/video_capture_device_client.h" +#include "media/capture/video_capture_types.h" #include "services/video_capture/public/mojom/device.mojom.h" namespace media { @@ -18,8 +18,7 @@ public: virtual void StartInProcess( const media::VideoCaptureParams& requested_settings, - const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - media::VideoEffectsContext context) {} + const base::WeakPtr<media::VideoFrameReceiver>& frame_handler) {} virtual void StopInProcess() {} };
diff --git a/services/video_capture/device_media_to_mojo_adapter.cc b/services/video_capture/device_media_to_mojo_adapter.cc index 2b730d6..19a15820 100644 --- a/services/video_capture/device_media_to_mojo_adapter.cc +++ b/services/video_capture/device_media_to_mojo_adapter.cc
@@ -19,7 +19,6 @@ #include "media/capture/video/video_frame_receiver_on_task_runner.h" #include "mojo/public/cpp/bindings/callback_helpers.h" #include "services/video_capture/public/cpp/receiver_mojo_to_media_adapter.h" -#include "services/video_effects/public/cpp/buildflags.h" #if BUILDFLAG(IS_CHROMEOS) #include "media/capture/video/chromeos/scoped_video_capture_jpeg_decoder.h" @@ -96,26 +95,19 @@ "DeviceMediaToMojoAdapter::Start"); StartInternal(std::move(requested_settings), std::move(video_frame_handler_pending_remote), - /*frame_handler=*/nullptr, /*start_in_process=*/false, - media::VideoEffectsContext( -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - /*video_effects_processor=*/{}, -#endif - /*readonly_manager_remote=*/{})); + /*frame_handler=*/nullptr, /*start_in_process=*/false); } void DeviceMediaToMojoAdapter::StartInProcess( const media::VideoCaptureParams& requested_settings, - const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - media::VideoEffectsContext context) { + const base::WeakPtr<media::VideoFrameReceiver>& frame_handler) { DCHECK(thread_checker_.CalledOnValidThread()); TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("video_and_image_capture"), "DeviceMediaToMojoAdapter::StartInProcess"); StartInternal(std::move(requested_settings), /*handler_pending_remote=*/std::nullopt, - std::move(frame_handler), /*start_in_process=*/true, - std::move(context)); + std::move(frame_handler), /*start_in_process=*/true); } void DeviceMediaToMojoAdapter::StartInternal( @@ -123,8 +115,7 @@ std::optional<mojo::PendingRemote<mojom::VideoFrameHandler>> handler_pending_remote, const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - bool start_in_process, - media::VideoEffectsContext context) { + bool start_in_process) { DCHECK(thread_checker_.CalledOnValidThread()); TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("video_and_image_capture"), "DeviceMediaToMojoAdapter::StartInternal"); @@ -191,7 +182,7 @@ &media::VideoFrameReceiver::OnLog, video_frame_receiver)))); #else // BUILDFLAG(IS_CHROMEOS) auto device_client = std::make_unique<media::VideoCaptureDeviceClient>( - std::move(media_receiver), buffer_pool, std::move(context)); + std::move(media_receiver), buffer_pool); #endif // !BUILDFLAG(IS_CHROMEOS) device_->AllocateAndStart(requested_settings, std::move(device_client));
diff --git a/services/video_capture/device_media_to_mojo_adapter.h b/services/video_capture/device_media_to_mojo_adapter.h index 6e3ac3e0..9e98bc6b 100644 --- a/services/video_capture/device_media_to_mojo_adapter.h +++ b/services/video_capture/device_media_to_mojo_adapter.h
@@ -52,8 +52,7 @@ handler_pending_remote) override; void StartInProcess( const media::VideoCaptureParams& requested_settings, - const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - media::VideoEffectsContext context) override; + const base::WeakPtr<media::VideoFrameReceiver>& frame_handler) override; void StopInProcess() override; void MaybeSuspend() override; void Resume() override; @@ -77,8 +76,7 @@ std::optional<mojo::PendingRemote<mojom::VideoFrameHandler>> handler_pending_remote, const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - bool start_in_process, - media::VideoEffectsContext context); + bool start_in_process); const std::unique_ptr<media::VideoCaptureDevice> device_; #if BUILDFLAG(IS_CHROMEOS)
diff --git a/services/video_capture/public/cpp/BUILD.gn b/services/video_capture/public/cpp/BUILD.gn index c3550de..d0c22ab5 100644 --- a/services/video_capture/public/cpp/BUILD.gn +++ b/services/video_capture/public/cpp/BUILD.gn
@@ -46,7 +46,6 @@ public_deps = [ "//services/video_capture/public/mojom", - "//services/video_effects/buildflags", "//testing/gmock", ] }
diff --git a/services/video_capture/public/mojom/BUILD.gn b/services/video_capture/public/mojom/BUILD.gn index cb63d77..d0980bca 100644 --- a/services/video_capture/public/mojom/BUILD.gn +++ b/services/video_capture/public/mojom/BUILD.gn
@@ -25,10 +25,7 @@ "//ui/gfx/geometry/mojom", ] - public_deps = [ - "//media/capture/mojom:video_effects_manager", - "//sandbox/policy/mojom", - ] + public_deps = [ "//sandbox/policy/mojom" ] if (is_chromeos) { deps += [
diff --git a/services/video_capture/shared_memory_virtual_device_mojo_adapter.cc b/services/video_capture/shared_memory_virtual_device_mojo_adapter.cc index 2afb6f4c..14d7a738 100644 --- a/services/video_capture/shared_memory_virtual_device_mojo_adapter.cc +++ b/services/video_capture/shared_memory_virtual_device_mojo_adapter.cc
@@ -172,8 +172,7 @@ void SharedMemoryVirtualDeviceMojoAdapter::StartInProcess( const media::VideoCaptureParams& requested_settings, - const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - media::VideoEffectsContext context) { + const base::WeakPtr<media::VideoFrameReceiver>& frame_handler) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); video_frame_handler_in_process_ = std::move(frame_handler); video_frame_handler_in_process_->OnStarted();
diff --git a/services/video_capture/shared_memory_virtual_device_mojo_adapter.h b/services/video_capture/shared_memory_virtual_device_mojo_adapter.h index a0f117e..e78eb91 100644 --- a/services/video_capture/shared_memory_virtual_device_mojo_adapter.h +++ b/services/video_capture/shared_memory_virtual_device_mojo_adapter.h
@@ -46,8 +46,7 @@ mojo::PendingRemote<mojom::VideoFrameHandler> receiver) override; void StartInProcess( const media::VideoCaptureParams& requested_settings, - const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - media::VideoEffectsContext context) override; + const base::WeakPtr<media::VideoFrameReceiver>& frame_handler) override; void MaybeSuspend() override; void Resume() override; void GetPhotoState(GetPhotoStateCallback callback) override;
diff --git a/services/video_capture/texture_virtual_device_mojo_adapter.cc b/services/video_capture/texture_virtual_device_mojo_adapter.cc index fca6463..9cce92b73 100644 --- a/services/video_capture/texture_virtual_device_mojo_adapter.cc +++ b/services/video_capture/texture_virtual_device_mojo_adapter.cc
@@ -136,8 +136,7 @@ void TextureVirtualDeviceMojoAdapter::StartInProcess( const media::VideoCaptureParams& requested_settings, - const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - media::VideoEffectsContext context) { + const base::WeakPtr<media::VideoFrameReceiver>& frame_handler) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); video_frame_handler_in_process_ = std::move(frame_handler); video_frame_handler_in_process_->OnStarted();
diff --git a/services/video_capture/texture_virtual_device_mojo_adapter.h b/services/video_capture/texture_virtual_device_mojo_adapter.h index 8c44ddd..3fd889c 100644 --- a/services/video_capture/texture_virtual_device_mojo_adapter.h +++ b/services/video_capture/texture_virtual_device_mojo_adapter.h
@@ -50,8 +50,7 @@ mojo::PendingRemote<mojom::VideoFrameHandler> handler) override; void StartInProcess( const media::VideoCaptureParams& requested_settings, - const base::WeakPtr<media::VideoFrameReceiver>& frame_handler, - media::VideoEffectsContext context) override; + const base::WeakPtr<media::VideoFrameReceiver>& frame_handler) override; void MaybeSuspend() override; void Resume() override; void GetPhotoState(GetPhotoStateCallback callback) override;
diff --git a/services/video_capture/video_source_impl.cc b/services/video_capture/video_source_impl.cc index 8da18dd..d5aef01 100644 --- a/services/video_capture/video_source_impl.cc +++ b/services/video_capture/video_source_impl.cc
@@ -9,7 +9,6 @@ #include "base/metrics/histogram_functions.h" #include "media/capture/video/video_capture_device_client.h" #include "services/video_capture/push_video_stream_subscription_impl.h" -#include "services/video_effects/public/cpp/buildflags.h" namespace video_capture { @@ -140,15 +139,8 @@ scoped_trace->AddStep("StartDevice"); // Device was created successfully. -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - auto context = media::VideoEffectsContext( - std::move(pending_video_effects_processor_), - std::move(pending_readonly_video_effects_manager_)); -#else - auto context = media::VideoEffectsContext(); -#endif info.device->StartInProcess(device_start_settings_, - broadcaster_.GetWeakPtr(), std::move(context)); + broadcaster_.GetWeakPtr()); UmaHistogramTimes("Media.VideoCapture.StartSourceSuccessLatency", base::TimeTicks::Now() - device_startup_start_time_); device_status_ = DeviceStatus::kStarted;
diff --git a/services/video_capture/video_source_impl.h b/services/video_capture/video_source_impl.h index 9c93d419..be49edd3 100644 --- a/services/video_capture/video_source_impl.h +++ b/services/video_capture/video_source_impl.h
@@ -22,11 +22,6 @@ #include "services/video_capture/public/mojom/video_frame_handler.mojom.h" #include "services/video_capture/public/mojom/video_source.mojom.h" #include "services/video_capture/public/mojom/video_source_provider.mojom.h" -#include "services/video_effects/public/cpp/buildflags.h" - -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) -#include "services/video_effects/public/mojom/video_effects_processor.mojom-forward.h" -#endif namespace video_capture { @@ -91,18 +86,6 @@ media::VideoCaptureParams device_start_settings_; bool restart_device_once_when_stop_complete_ = false; -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) - // Video effects processor that will be used to start the capture on the - // `device_`. - mojo::PendingRemote<video_effects::mojom::VideoEffectsProcessor> - pending_video_effects_processor_; - - // Video effects manager that will be used to check / observe configuration - // state as we as report errors. - mojo::PendingRemote<media::mojom::ReadonlyVideoEffectsManager> - pending_readonly_video_effects_manager_; -#endif - base::TimeTicks device_startup_start_time_; SEQUENCE_CHECKER(sequence_checker_);
diff --git a/testing/buildbot/internal.optimization_guide.json b/testing/buildbot/internal.optimization_guide.json index 21a21f6..0e0985d 100644 --- a/testing/buildbot/internal.optimization_guide.json +++ b/testing/buildbot/internal.optimization_guide.json
@@ -1557,6 +1557,26 @@ "test_id_prefix": "ninja://components/optimization_guide/internal/testing:model_validation_tests_light/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "ondevice_model_benchmark_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "cpu": "arm64", + "os": "Mac-15", + "pool": "chrome.tests" + }, + "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "ondevice_model_benchmark_tests", + "test_id_prefix": "ninja://components/optimization_guide/internal/testing:ondevice_model_benchmark_tests/" + }, + { "args": [ "--chromedriver", "chromedriver", @@ -1734,6 +1754,26 @@ "test_id_prefix": "ninja://components/optimization_guide/internal/testing:model_validation_tests_light/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "ondevice_model_benchmark_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15", + "pool": "chrome.tests" + }, + "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "ondevice_model_benchmark_tests", + "test_id_prefix": "ninja://components/optimization_guide/internal/testing:ondevice_model_benchmark_tests/" + }, + { "args": [ "--chromedriver", "chromedriver",
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json index 71413e24..5a7c74c 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -946,21 +946,20 @@ ], "experiments": [ { - "name": "CreateWithLowestRanking", + "name": "WithMemoryThreshold", "params": { "kill_when_backgrounded": "true", "lowest-ranking": "true", "not-perceptible-binding": "false", "omnibox_spare_renderer_delay_ms": "500", "remove-binding-no-timeout": "true", - "spare_renderer_creation_delay_ms": "2000", + "spare_renderer_available_memory_threshold_enabled": "true", "spare_renderer_creation_timing": "after-loading", "spare_renderer_timeout_seconds": "60" }, "enable_features": [ "AndroidWarmUpSpareRendererWithTimeout", "OverrideAndroidOmniboxSpareRendererDelay", - "ServiceGroupImportance", "SpareRendererProcessPriority" ] } @@ -8868,24 +8867,6 @@ ] } ], - "DisableGles2ForOopR": [ - { - "platforms": [ - "fuchsia", - "linux", - "mac", - "windows" - ], - "experiments": [ - { - "name": "Enabled", - "disable_features": [ - "UseGles2ForOopR" - ] - } - ] - } - ], "DisableInstanceLimitWithV2Switcher": [ { "platforms": [ @@ -25838,6 +25819,22 @@ ] } ], + "UseIsUnboundCheck": [ + { + "platforms": [ + "android", + "android_webview" + ], + "experiments": [ + { + "name": "Enabled", + "enable_features": [ + "UseIsUnboundCheck" + ] + } + ] + } + ], "UseIssueTokenToFetchAccessTokens": [ { "platforms": [
diff --git a/third_party/angle b/third_party/angle index 392d4a4..1f40285 160000 --- a/third_party/angle +++ b/third_party/angle
@@ -1 +1 @@ -Subproject commit 392d4a4dbfd8ba6f9935b2d1bb44f7e552e9ad26 +Subproject commit 1f40285c90cd45ae6238c57f30d0ec8c8d6e2e4b
diff --git a/third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom b/third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom index 21af34e..2758d78 100644 --- a/third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom +++ b/third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom
@@ -4901,10 +4901,12 @@ kSchedulerYieldNonTrivialInherit = 5590, kSchedulerYieldNonTrivialInheritCrossFrameIgnored = 5591, kLocalNetworkAccessPrivateAliasUse = 5592, + // The items above roughly this point are available in the M138 branch. kV8URLPattern_Generate_Method = 5593, kSelectMultipleSizeOne = 5594, kWebGPUFeatureLevelCompatibility = 5595, kOverscrollBehaviorOnNonScrollableScrollContainer = 5596, + // The items above roughly this point are available in the M139 branch. kInteractiveContentSummaryDescendant = 5597, kSpeculationRulesEagernessEager = 5598, kCSSSelectorPseudoNot = 5599, @@ -4937,6 +4939,7 @@ kSharedWorkerStartOnAndroid = 5626, kLocalNetworkAccessWithinSharedWorker = 5627, kLocalNetworkAccessWithinDedicatedWorker = 5628, + // The items above roughly this point are available in the M140 branch. kCSSPseudoParentInScope = 5629, kInterestHintPseudoElement = 5630, kCookieStoreEmptyPath = 5631, @@ -4962,6 +4965,7 @@ kV8WasmCustomDescriptors = 5651, kSRIIntegrityAttributeOnInlineScript = 5652, kCredentialsGetImmediateMediationWithPasswordsOnly = 5653, + // The items above roughly this point are available in the M141 branch. kCSSAtRuleRoute = 5654, kAbsposPositionTryFallbacksChange = 5655, kMulticastControllerJoinGroupFunction = 5656, @@ -4980,6 +4984,7 @@ kIndexedDBGetAllRecords = 5669, kResolvedColumnRuleWidthWithNoneOrHiddenStyle = 5670, kResolvedOutlineWidthWithNoneOrHiddenStyle = 5671, + kContextMenuEventDefaultPrevented = 5672, // Add new features immediately above this line. Don't change assigned // numbers of any item, and don't reuse removed slots. Also don't add extra
diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h index 4152704..ed9bde0 100644 --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h
@@ -1449,6 +1449,9 @@ V8HTMLOrSVGScriptElement* currentScriptForBinding() const; void PushCurrentScript(ScriptElementBase*); void PopCurrentScript(ScriptElementBase*); + bool IsCurrentScriptStackEmpty() const { + return current_script_stack_.empty(); + } void SetTransformSource(std::unique_ptr<TransformSource>); TransformSource* GetTransformSource() const {
diff --git a/third_party/blink/renderer/core/input/event_handler.cc b/third_party/blink/renderer/core/input/event_handler.cc index 0a542c36..a1d653ee 100644 --- a/third_party/blink/renderer/core/input/event_handler.cc +++ b/third_party/blink/renderer/core/input/event_handler.cc
@@ -2144,22 +2144,25 @@ PhysicalOffset position_in_contents(v->ConvertFromRootFrame( gfx::ToFlooredPoint(event.PositionInRootFrame()))); HitTestRequest request(HitTestRequest::kActive); + Document& document = *frame_->GetDocument(); MouseEventWithHitTestResults mev = - frame_->GetDocument()->PerformMouseEventHitTest( - request, position_in_contents, event); + document.PerformMouseEventHitTest(request, position_in_contents, event); // Since |Document::performMouseEventHitTest()| modifies layout tree for // setting hover element, we need to update layout tree for requirement of // |SelectionController::sendContextMenuEvent()|. - frame_->GetDocument()->UpdateStyleAndLayout( - DocumentUpdateReason::kContextMenu); + document.UpdateStyleAndLayout(DocumentUpdateReason::kContextMenu); Element* target_element = override_target_element ? override_target_element : mev.InnerElement(); - return mouse_event_manager_->DispatchMouseEvent( + WebInputEventResult result = mouse_event_manager_->DispatchMouseEvent( EffectiveMouseEventTargetElement(target_element), event_type_names::kContextmenu, event, nullptr, nullptr, false, event.id, PointerEventFactory::PointerTypeNameForWebPointPointerType( event.pointer_type)); + if (result == WebInputEventResult::kHandledApplication) { + UseCounter::Count(document, WebFeature::kContextMenuEventDefaultPrevented); + } + return result; } static bool ShouldShowContextMenuAtSelection(const FrameSelection& selection) {
diff --git a/third_party/blink/renderer/core/script/build.gni b/third_party/blink/renderer/core/script/build.gni index 07fee615..61081ab5 100644 --- a/third_party/blink/renderer/core/script/build.gni +++ b/third_party/blink/renderer/core/script/build.gni
@@ -77,4 +77,5 @@ "module_record_resolver_impl_test.cc", "module_script_test.cc", "script_runner_test.cc", + "pending_script_test.cc", ]
diff --git a/third_party/blink/renderer/core/script/pending_script.cc b/third_party/blink/renderer/core/script/pending_script.cc index 858ddc7..6cd0cbe 100644 --- a/third_party/blink/renderer/core/script/pending_script.cc +++ b/third_party/blink/renderer/core/script/pending_script.cc
@@ -296,11 +296,11 @@ // Implemented as the scope out of IgnoreDestructiveWriteCountIncrementer. } - // NOTE: we do not check m_willBeParserExecuted here, since - // m_willBeParserExecuted is false for inline scripts, and we want to - // include inline script execution time as part of parser blocked script - // execution time. - if (!is_controlled_by_script_runner) { + // We want to record the time spent executing scripts which is blocking the + // parser. If the script is nested, we only want to count the outermost + // script execution time. + if (context_document->IsCurrentScriptStackEmpty() && + !is_controlled_by_script_runner) { DocumentParserTiming::From(element_document) .RecordParserBlockedOnScriptExecutionDuration( base::TimeTicks::Now() - script_exec_start_time,
diff --git a/third_party/blink/renderer/core/script/pending_script_test.cc b/third_party/blink/renderer/core/script/pending_script_test.cc new file mode 100644 index 0000000..749af909 --- /dev/null +++ b/third_party/blink/renderer/core/script/pending_script_test.cc
@@ -0,0 +1,95 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/location.h" +#include "base/time/time.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/renderer/core/frame/frame_test_helpers.h" +#include "third_party/blink/renderer/core/testing/page_test_base.h" +#include "third_party/blink/renderer/platform/testing/unit_test_helpers.h" +#include "third_party/blink/renderer/platform/testing/url_test_helpers.h" + +namespace blink { + +namespace { +// The script execution time in nested-script.js must greater than 200 +// milliseconds. +constexpr base::TimeDelta kScriptRunTime = base::Milliseconds(200); +} // namespace + +class PendingScriptTest : public PageTestBase { + public: + PendingScriptTest() = default; + ~PendingScriptTest() override = default; + + void SetUp() override { PageTestBase::SetUp(); } + + void TearDown() override { + url_test_helpers::UnregisterAllURLsAndClearMemoryCache(); + PageTestBase::TearDown(); + } + + protected: + void CheckParseBlockedOnScriptExecutionDuration( + const String& file_name, + bool is_parser_blocked, + base::Location location = FROM_HERE) { + WebURL mocked_mainframe_url = RegisterMockedURLLoadFromBase(file_name); + + frame_test_helpers::WebViewHelper web_view_helper; + web_view_helper.InitializeAndLoad(mocked_mainframe_url.GetString().Utf8()); + + auto performance_metrics = + web_view_helper.LocalMainFrame()->PerformanceMetricsForReporting(); + auto parse_blocked_on_script_execution_duration = base::Seconds( + performance_metrics.ParseBlockedOnScriptExecutionDuration()); + if (is_parser_blocked) { + EXPECT_GE(parse_blocked_on_script_execution_duration, kScriptRunTime) + << location.ToString(); + } else { + EXPECT_EQ(parse_blocked_on_script_execution_duration, base::TimeDelta()) + << location.ToString(); + } + auto parse_duration = base::Seconds(performance_metrics.ParseStop() - + performance_metrics.ParseStart()); + // `PageLoadTiming` wouldn't be recorded if + // `ParseBlockedOnScriptExecutionDuration()` is longer than total parse + // time, so we expect `parse_duration` to be greater than + // `parse_blocked_on_script_execution_duration`. + EXPECT_GT(parse_duration, parse_blocked_on_script_execution_duration) + << location.ToString(); + } + + WebURL RegisterMockedURLLoadFromBase(const String& filename, + const String& mime_type = "text/html") { + return url_test_helpers::RegisterMockedURLLoadFromBase( + base_url_, test::CoreTestDataPath(relative_path_), filename, mime_type); + } + + private: + const String base_url_ = "http://internal.test/"; + const String relative_path_ = "script"; +}; + +TEST_F(PendingScriptTest, + OnlyCountOutermostScriptExecutionTime_ParserBlockedScript) { + RegisterMockedURLLoadFromBase("nested-script.js", "text/javascript"); + CheckParseBlockedOnScriptExecutionDuration( + "parser-blocked-inline-nested-script.html", true); + CheckParseBlockedOnScriptExecutionDuration( + "parser-blocked-external-nested-script.html", true); + CheckParseBlockedOnScriptExecutionDuration( + "parser-blocked-module-nested-script.html", true); + CheckParseBlockedOnScriptExecutionDuration( + "parser-blocked-defer-nested-script.html", true); +} + +TEST_F(PendingScriptTest, + OnlyCountOutermostScriptExecutionTime_NotParserBlockedScript) { + RegisterMockedURLLoadFromBase("nested-script.js", "text/javascript"); + CheckParseBlockedOnScriptExecutionDuration( + "not-parser-blocked-async-nested-script.html", false); +} + +} // namespace blink
diff --git a/third_party/blink/renderer/core/testing/data/core_test_bundle_data.filelist b/third_party/blink/renderer/core/testing/data/core_test_bundle_data.filelist index e9446e3..accfee2ff 100644 --- a/third_party/blink/renderer/core/testing/data/core_test_bundle_data.filelist +++ b/third_party/blink/renderer/core/testing/data/core_test_bundle_data.filelist
@@ -433,6 +433,12 @@ testing/data/rtl-iframe.html testing/data/rtl-overview-mode.html testing/data/scale_oscillate.html +testing/data/script/nested-script.js +testing/data/script/not-parser-blocked-async-nested-script.html +testing/data/script/parser-blocked-defer-nested-script.html +testing/data/script/parser-blocked-external-nested-script.html +testing/data/script/parser-blocked-inline-nested-script.html +testing/data/script/parser-blocked-module-nested-script.html testing/data/script_priority.html testing/data/scroll-event-handler-window.html testing/data/scroll-event-handler.html
diff --git a/third_party/blink/renderer/core/testing/data/script/nested-script.js b/third_party/blink/renderer/core/testing/data/script/nested-script.js new file mode 100644 index 0000000..8b2b6b6 --- /dev/null +++ b/third_party/blink/renderer/core/testing/data/script/nested-script.js
@@ -0,0 +1,9 @@ +const script = document.createElement('script'); +script.type = 'text/javascript'; +script.textContent = ` +const start = Date.now(); +while (Date.now() - start <= 200) { + // Simulate a long-running script +} +`; +document.body.appendChild(script);
diff --git a/third_party/blink/renderer/core/testing/data/script/not-parser-blocked-async-nested-script.html b/third_party/blink/renderer/core/testing/data/script/not-parser-blocked-async-nested-script.html new file mode 100644 index 0000000..2f23df8 --- /dev/null +++ b/third_party/blink/renderer/core/testing/data/script/not-parser-blocked-async-nested-script.html
@@ -0,0 +1,5 @@ +<html lang="en"> +<body> + <script src="nested-script.js" async></script> +</body> +</html>
diff --git a/third_party/blink/renderer/core/testing/data/script/parser-blocked-defer-nested-script.html b/third_party/blink/renderer/core/testing/data/script/parser-blocked-defer-nested-script.html new file mode 100644 index 0000000..7699fa3 --- /dev/null +++ b/third_party/blink/renderer/core/testing/data/script/parser-blocked-defer-nested-script.html
@@ -0,0 +1,5 @@ +<html lang="en"> +<body> + <script src="nested-script.js" defer></script> +</body> +</html>
diff --git a/third_party/blink/renderer/core/testing/data/script/parser-blocked-external-nested-script.html b/third_party/blink/renderer/core/testing/data/script/parser-blocked-external-nested-script.html new file mode 100644 index 0000000..f04d521 --- /dev/null +++ b/third_party/blink/renderer/core/testing/data/script/parser-blocked-external-nested-script.html
@@ -0,0 +1,5 @@ +<html lang="en"> +<body> + <script type="text/javascript" src="nested-script.js"></script> +</body> +</html>
diff --git a/third_party/blink/renderer/core/testing/data/script/parser-blocked-inline-nested-script.html b/third_party/blink/renderer/core/testing/data/script/parser-blocked-inline-nested-script.html new file mode 100644 index 0000000..80940bfb --- /dev/null +++ b/third_party/blink/renderer/core/testing/data/script/parser-blocked-inline-nested-script.html
@@ -0,0 +1,15 @@ +<html lang="en"> +<body> + <script type="text/javascript"> + const script = document.createElement('script'); + script.type = 'text/javascript'; + script.textContent = ` + const start = Date.now(); + while (Date.now() - start <= 200) { + // Simulate a long-running script + } + `; + document.body.appendChild(script); + </script> +</body> +</html>
diff --git a/third_party/blink/renderer/core/testing/data/script/parser-blocked-module-nested-script.html b/third_party/blink/renderer/core/testing/data/script/parser-blocked-module-nested-script.html new file mode 100644 index 0000000..b5d4938 --- /dev/null +++ b/third_party/blink/renderer/core/testing/data/script/parser-blocked-module-nested-script.html
@@ -0,0 +1,5 @@ +<html lang="en"> +<body> + <script type="module" src="nested-script.js"></script> +</body> +</html>
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_test.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_test.cc index 22d57515..2dbc1ef 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_test.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_test.cc
@@ -602,8 +602,6 @@ bool SupportsDirectCompositing() const override { return supports_direct_compositing_; } - bool IsSingleBuffered() const override { return false; } - bool IsValid() const override { return true; } sk_sp<SkSurface> CreateSkSurface() const override { return SkSurfaces::Raster(GetSkImageInfo()); }
diff --git a/third_party/blink/renderer/platform/graphics/canvas_resource_provider.h b/third_party/blink/renderer/platform/graphics/canvas_resource_provider.h index 0dffd6b..925f793 100644 --- a/third_party/blink/renderer/platform/graphics/canvas_resource_provider.h +++ b/third_party/blink/renderer/platform/graphics/canvas_resource_provider.h
@@ -492,22 +492,6 @@ Delegate*); ~CanvasResourceProviderSharedImage() override; - CanvasResourceProviderSharedImage* AsSharedImageProvider() override { - return this; - } - bool IsAccelerated() const final { return is_accelerated_; } - bool SupportsDirectCompositing() const override { return true; } - bool unused_resources_reclaim_timer_is_running_for_testing() const { - return unused_resources_reclaim_timer_.IsRunning(); - } - int NumInflightResourcesForTesting() const { return num_inflight_resources_; } - - scoped_refptr<CanvasResource> ProduceCanvasResource( - FlushReason reason) override; - bool IsValid() const override; - gpu::SharedImageUsageSet GetSharedImageUsageFlags() const; - bool HasUnusedResourcesForTesting() const; - // Returns the ClientSharedImage backing this CanvasResourceProvider, if one // exists, after flushing the resource and signaling that an external write // will occur on it. The caller should wait on `internal_access_sync_token` @@ -530,9 +514,6 @@ // write have completed. Ensures that the next read of this resource (whether // via raster or the compositor) waits on this token. void EndExternalWrite(const gpu::SyncToken& external_write_sync_token); - scoped_refptr<StaticBitmapImage> Snapshot( - FlushReason reason, - ImageOrientation = ImageOrientationEnum::kDefault) override; // For WebGpu RecyclableCanvasResource. void OnAcquireRecyclableCanvasResource(); @@ -548,21 +529,49 @@ const gfx::Rect& copy_rect, const gpu::SyncToken& ready_sync_token, gpu::SyncToken& completion_sync_token); - bool WritePixels(const SkImageInfo& orig_info, - const void* pixels, - size_t row_bytes, - int x, - int y) override; void ClearUnusedResources() { unused_resources_.clear(); } - bool IsSingleBuffered() const override; void OnResourceRefReturned( scoped_refptr<CanvasResourceSharedImage>&& resource); void OnDestroyResource() { --num_inflight_resources_; } void SetResourceRecyclingEnabled(bool value); + bool unused_resources_reclaim_timer_is_running_for_testing() const { + return unused_resources_reclaim_timer_.IsRunning(); + } + int NumInflightResourcesForTesting() const { return num_inflight_resources_; } + gpu::SharedImageUsageSet GetSharedImageUsageFlags() const; + bool HasUnusedResourcesForTesting() const; + constexpr static base::TimeDelta kUnusedResourceExpirationTime = base::Seconds(5); + // CanvasResourceProvider: + CanvasResourceProviderSharedImage* AsSharedImageProvider() final { + return this; + } + bool IsAccelerated() const final { return is_accelerated_; } + bool SupportsDirectCompositing() const override { return true; } + scoped_refptr<CanvasResource> ProduceCanvasResource( + FlushReason reason) override; + bool IsValid() const override; + bool IsSoftwareSharedImageGpuChannelLost() const final; + void ExternalCanvasDrawHelper( + base::FunctionRef<void(MemoryManagedPaintCanvas&)> draw_callback) final; + void RasterRecord(cc::PaintRecord last_recording) override; + sk_sp<SkSurface> CreateSkSurface() const override; + void OnFlushForImage(cc::PaintImage::ContentId content_id) final; + void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) final; + scoped_refptr<StaticBitmapImage> Snapshot( + FlushReason reason, + ImageOrientation = ImageOrientationEnum::kDefault) override; + bool IsSingleBuffered() const final; + bool WritePixels(const SkImageInfo& orig_info, + const void* pixels, + size_t row_bytes, + int x, + int y) override; + void WillDraw() final; + private: scoped_refptr<CanvasResourceSharedImage> CreateResource(); @@ -593,28 +602,18 @@ void EnsureWriteAccess(); void EndWriteAccess(); void WillDrawInternal(bool write_to_local_texture); - void WillDraw() override; - bool IsSoftwareSharedImageGpuChannelLost() const override; - void ExternalCanvasDrawHelper( - base::FunctionRef<void(MemoryManagedPaintCanvas&)> draw_callback) - override; - void RasterRecord(cc::PaintRecord last_recording) override; - sk_sp<SkSurface> CreateSkSurface() const override; - void OnFlushForImage(cc::PaintImage::ContentId content_id) override; - - void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) override; - - // `viz::ContextLostObserver` implementation. - void OnContextLost() override; - - // BitmapGpuChannelLostObserver implementation. - void OnGpuChannelLost() override; void RecycleResource(scoped_refptr<CanvasResourceSharedImage>&& resource); void MaybePostUnusedResourcesReclaimTask(); void ClearOldUnusedResources(); base::WeakPtr<CanvasResourceProviderSharedImage> CreateWeakPtr(); + // `viz::ContextLostObserver`: + void OnContextLost() final; + + // BitmapGpuChannelLostObserver: + void OnGpuChannelLost() final; + // If this instance is single-buffered or |resource_recycling_enabled_| is // false, |unused_resources_| will be empty. Vector<UnusedResource> unused_resources_;
diff --git a/third_party/blink/web_tests/NeverFixTests b/third_party/blink/web_tests/NeverFixTests index cbc5a13..37292c9 100644 --- a/third_party/blink/web_tests/NeverFixTests +++ b/third_party/blink/web_tests/NeverFixTests
@@ -113,6 +113,7 @@ [ Mac ] fast/events/context-menu-key-shift-f10-modifiers.html [ Skip ] [ Mac ] fast/events/context-menu-key-shift-f10-prevent-default.html [ Skip ] [ Mac ] fast/events/contextmenu-follows-focus.html [ Skip ] +[ Mac ] fast/events/contextmenu-prevent-use-counter.html [ Skip ] [ Mac ] fast/events/menu-key-context-menu-document.html [ Skip ] [ Mac ] fast/events/menu-key-context-menu-position.html [ Skip ] [ Mac ] fast/events/menu-key-context-menu-reveal-focus.html [ Skip ]
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index 620be0b..b5ed90d 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -1134,7 +1134,6 @@ crbug.com/1076027 external/wpt/css/css-grid/masonry/tentative/intrinsic-sizing/* [ Failure Skip ] crbug.com/1076027 external/wpt/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-003.html [ Failure ] crbug.com/1076027 external/wpt/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-006.html [ Failure ] -crbug.com/1076027 external/wpt/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-012.html [ Failure ] crbug.com/1076027 external/wpt/css/css-grid/masonry/tentative/track-sizing/auto-repeat/intrinsic-auto-repeat/row-auto-repeat-auto-006.html [ Failure ] # Masonry named line failures crbug.com/1076027 external/wpt/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html [ Failure ]
diff --git a/third_party/blink/web_tests/external/wpt/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-012-ref.html b/third_party/blink/web_tests/external/wpt/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-012-ref.html index a4f4f02..2c1da3f 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-012-ref.html +++ b/third_party/blink/web_tests/external/wpt/css/css-grid/masonry/tentative/track-sizing/auto-repeat/row-auto-repeat-012-ref.html
@@ -5,6 +5,7 @@ border: solid thick; margin: 10px; grid-template-rows: repeat(auto-fill, 50px 50px); + grid-template-columns: auto auto; grid-row-gap: 100px; height: 300px; width: min-content;
diff --git a/third_party/blink/web_tests/fast/events/contextmenu-prevent-use-counter.html b/third_party/blink/web_tests/fast/events/contextmenu-prevent-use-counter.html new file mode 100644 index 0000000..51096ba --- /dev/null +++ b/third_party/blink/web_tests/fast/events/contextmenu-prevent-use-counter.html
@@ -0,0 +1,30 @@ +<!DOCTYPE HTML> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> + +<a href=# id=link>Link</a> + +<script> +promise_test(async () => { + assert_own_property(window, 'eventSender', 'This test requires eventSender.'); + const kContextMenuEventDefaultPrevented = 5672; // From UseCounter.h + let isCounted = () => internals.isUseCounted(document, kContextMenuEventDefaultPrevented); + assert_false(isCounted(),'should not be counted to start'); + + let eventCount = 0; + link.addEventListener('contextmenu',() => (++eventCount)); + + // Fire the context menu event + link.focus(); + assert_equals(eventCount,0); + eventSender.keyDown('ContextMenu'); + assert_equals(eventCount,1,'context menu should have fired'); + assert_false(isCounted(),'event wasn\'t cancelled'); + + link.addEventListener('contextmenu',(e) => e.preventDefault()); + + eventSender.keyDown('ContextMenu'); + assert_equals(eventCount,2,'context menu should have fired again'); + assert_true(isCounted(),'use counter should have fired'); +}, 'context menu preventDefault is use counted'); +</script>
diff --git a/third_party/boringssl/src b/third_party/boringssl/src index f12212b..83297c2 160000 --- a/third_party/boringssl/src +++ b/third_party/boringssl/src
@@ -1 +1 @@ -Subproject commit f12212bb7348934f82fc84b110b4002c75ab2bdd +Subproject commit 83297c2706c5497b2dba7fbb9524234d80945287
diff --git a/third_party/catapult b/third_party/catapult index 77ca383..e2b34e6 160000 --- a/third_party/catapult +++ b/third_party/catapult
@@ -1 +1 @@ -Subproject commit 77ca383b7422ce137e49abd10e81997d48d80e64 +Subproject commit e2b34e6c5df90b060797419372b230d5638a3843
diff --git a/third_party/compiler-rt/src b/third_party/compiler-rt/src index 5d7b9da..0214529 160000 --- a/third_party/compiler-rt/src +++ b/third_party/compiler-rt/src
@@ -1 +1 @@ -Subproject commit 5d7b9da0deb8d82caf76d90f02d775ee708bf42b +Subproject commit 02145296c3a848274a6146176a74d0e468452e68
diff --git a/third_party/crossbench b/third_party/crossbench index d8cebce..1584e10 160000 --- a/third_party/crossbench +++ b/third_party/crossbench
@@ -1 +1 @@ -Subproject commit d8cebcefbb9280d4bc5a6ea138cee6b12399277b +Subproject commit 1584e10215b310d7212edd3d59a58056966f175a
diff --git a/third_party/devtools-frontend/src b/third_party/devtools-frontend/src index 51be2d2..2d6e3ee 160000 --- a/third_party/devtools-frontend/src +++ b/third_party/devtools-frontend/src
@@ -1 +1 @@ -Subproject commit 51be2d28128f3594b67ef99d24f4c58e68b6bab8 +Subproject commit 2d6e3ee0f3197f192fe4d759e8eb6934dea46069
diff --git a/third_party/glslang/src b/third_party/glslang/src index d213562..a57276b 160000 --- a/third_party/glslang/src +++ b/third_party/glslang/src
@@ -1 +1 @@ -Subproject commit d213562e35573012b6348b2d584457c3704ac09b +Subproject commit a57276bf558f5cf94d3a9854ebdf5a2236849a5a
diff --git a/third_party/libc++/src b/third_party/libc++/src index e39a567..bcc74d7 160000 --- a/third_party/libc++/src +++ b/third_party/libc++/src
@@ -1 +1 @@ -Subproject commit e39a56726813663b378f05bd3096cbde2ec92ce7 +Subproject commit bcc74d7745a74dae059f1a4ca97e2979f5f77661
diff --git a/third_party/llvm-libc/src b/third_party/llvm-libc/src index a1d9ff0..0388350 160000 --- a/third_party/llvm-libc/src +++ b/third_party/llvm-libc/src
@@ -1 +1 @@ -Subproject commit a1d9ff08450caebe4c81de1ff07682f1d0a8806a +Subproject commit 0388350fe90308d6c274af8f9ee2f1d6bcd28054
diff --git a/third_party/skia b/third_party/skia index 5d99c3f..b54e106 160000 --- a/third_party/skia +++ b/third_party/skia
@@ -1 +1 @@ -Subproject commit 5d99c3fc7c8333de67376ce902a79b4ad53adcb1 +Subproject commit b54e1064ccae404b7a7bff410585fef1c5381241
diff --git a/third_party/vulkan-deps b/third_party/vulkan-deps index 1acbb10..2458bba 160000 --- a/third_party/vulkan-deps +++ b/third_party/vulkan-deps
@@ -1 +1 @@ -Subproject commit 1acbb10d560942f3deccc74f55f91bf257d3ec91 +Subproject commit 2458bba6f0d087f6ad588af68bcb4075c1d0701b
diff --git a/third_party/vulkan-headers/src b/third_party/vulkan-headers/src index 9a0f309..a4f8ada 160000 --- a/third_party/vulkan-headers/src +++ b/third_party/vulkan-headers/src
@@ -1 +1 @@ -Subproject commit 9a0f3099c8a9607a7c0f3127d8abfdc19a93e8c5 +Subproject commit a4f8ada9f4f97c45b8c89c57997be9cebaae65d2
diff --git a/third_party/zstd/README.chromium b/third_party/zstd/README.chromium index 657e6121..4f239e3 100644 --- a/third_party/zstd/README.chromium +++ b/third_party/zstd/README.chromium
@@ -1,7 +1,7 @@ Name: Zstandard Short Name: zstd URL: https://github.com/facebook/zstd -Version: e128976193546dceb24249206a02ff8f444f7120 +Version: 89d685e42dbcf815a16ed0fcd7d050ef74ccad96 Update Mechanism: Manual License: BSD-3-Clause License File: src/LICENSE
diff --git a/third_party/zstd/src b/third_party/zstd/src index e128976..89d685e 160000 --- a/third_party/zstd/src +++ b/third_party/zstd/src
@@ -1 +1 @@ -Subproject commit e128976193546dceb24249206a02ff8f444f7120 +Subproject commit 89d685e42dbcf815a16ed0fcd7d050ef74ccad96
diff --git a/tools/metrics/histograms/metadata/autofill/enums.xml b/tools/metrics/histograms/metadata/autofill/enums.xml index fc6c172..42d7f7e 100644 --- a/tools/metrics/histograms/metadata/autofill/enums.xml +++ b/tools/metrics/histograms/metadata/autofill/enums.xml
@@ -2881,6 +2881,17 @@ (ERROR)"/> </enum> +<!-- LINT.IfChange(AutofillSettingsReferrer) --> + +<enum name="AutofillSettingsReferrer"> + <int value="0" label="ProfileMenu"/> + <int value="1" label="SettingsMenu"/> + <int value="2" label="AutofillAndPasswordsPage"/> + <int value="3" label="FillingFlowDropdown"/> +</enum> + +<!-- LINT.ThenChange(/components/autofill/core/browser/metrics/autofill_settings_metrics.h:AutofillSettingsReferrer,/chrome/browser/resources/settings/metrics_browser_proxy.ts:AutofillSettingsReferrer) --> + <enum name="AutofillSettingsVisibleTypes"> <int value="0" label="Undefined"/> <int value="1" label="Name"/>
diff --git a/tools/metrics/histograms/metadata/autofill/histograms.xml b/tools/metrics/histograms/metadata/autofill/histograms.xml index 64843df..7161db17 100644 --- a/tools/metrics/histograms/metadata/autofill/histograms.xml +++ b/tools/metrics/histograms/metadata/autofill/histograms.xml
@@ -961,6 +961,18 @@ </summary> </histogram> +<histogram name="Autofill.AddressesSettingsPage.VisitReferrer" + enum="AutofillSettingsReferrer" expires_after="2026-09-15"> + <owner>ireneuszszulc@google.com</owner> + <owner>chrome-autofill-alerts@google.com</owner> + <summary> + Records the entry point (referrer) every time the user visits the + 'Addresses' settings page from a tracked entry point. This metric is emitted + on navigation to the page, with the enum values distinguishing the entry + points (different ways of reaching the page). + </summary> +</histogram> + <histogram name="Autofill.AddressesSuppressedForDisuse" units="addresses" expires_after="2026-03-01"> <owner>battre@chromium.org</owner> @@ -1704,6 +1716,18 @@ </summary> </histogram> +<histogram name="Autofill.AutofillAndPasswordsSettingsPage.VisitReferrer" + enum="AutofillSettingsReferrer" expires_after="2026-09-15"> + <owner>ireneuszszulc@google.com</owner> + <owner>chrome-autofill-alerts@google.com</owner> + <summary> + Records the entry point (referrer) every time the user visits the 'Autofill + and Passwords' settings page from a tracked entry point. This metric is + emitted on navigation to the page, with the enum values distinguishing the + entry points (different ways of reaching the page). + </summary> +</histogram> + <histogram name="Autofill.AutomationRate.{FormType}" units="%" expires_after="2026-03-01"> <owner>battre@chromium.org</owner> @@ -3770,6 +3794,18 @@ </summary> </histogram> +<histogram name="Autofill.FormsAiSettingsPage.VisitReferrer" + enum="AutofillSettingsReferrer" expires_after="2026-09-15"> + <owner>ireneuszszulc@google.com</owner> + <owner>chrome-autofill-alerts@google.com</owner> + <summary> + Records the entry point (referrer) every time the user visits the 'Forms AI' + settings page from a tracked entry point. This metric is emitted on + navigation to the page, with the enum values distinguishing the entry points + (different ways of reaching the page). + </summary> +</histogram> + <histogram name="Autofill.FormSubmission.PerProfileType" enum="BrowserProfileType" expires_after="2026-03-01"> <owner>arabm@google.com</owner> @@ -5242,6 +5278,18 @@ </summary> </histogram> +<histogram name="Autofill.PaymentMethodsSettingsPage.VisitReferrer" + enum="AutofillSettingsReferrer" expires_after="2026-09-15"> + <owner>ireneuszszulc@google.com</owner> + <owner>chrome-autofill-alerts@google.com</owner> + <summary> + Records the entry point (referrer) every time the user visits the 'Payment + methods' settings page from a tracked entry point. This metric is emitted on + navigation to the page, with the enum values distinguishing the entry points + (different ways of reaching the page). + </summary> +</histogram> + <histogram name="Autofill.PaymentsDataManager.LocalCardAdded" enum="Boolean" expires_after="2026-02-09"> <owner>npnavarro@google.com</owner>
diff --git a/tools/metrics/histograms/metadata/blink/enums.xml b/tools/metrics/histograms/metadata/blink/enums.xml index 14d2ff9..9b196a0 100644 --- a/tools/metrics/histograms/metadata/blink/enums.xml +++ b/tools/metrics/histograms/metadata/blink/enums.xml
@@ -6278,6 +6278,7 @@ <int value="5669" label="IndexedDBGetAllRecords"/> <int value="5670" label="ResolvedColumnRuleWidthWithNoneOrHiddenStyle"/> <int value="5671" label="ResolvedOutlineWidthWithNoneOrHiddenStyle"/> + <int value="5672" label="ContextMenuEventDefaultPrevented"/> </enum> <!-- LINT.ThenChange(//third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom:WebFeature) -->
diff --git a/tools/metrics/histograms/metadata/media/histograms.xml b/tools/metrics/histograms/metadata/media/histograms.xml index 3cb0269..5ee50466 100644 --- a/tools/metrics/histograms/metadata/media/histograms.xml +++ b/tools/metrics/histograms/metadata/media/histograms.xml
@@ -6590,7 +6590,7 @@ </histogram> <histogram name="Media.Ui.GetDisplayMedia.HasScreenRecordingPermission" - enum="Boolean" expires_after="2025-09-28"> + enum="Boolean" expires_after="2026-09-25"> <owner>tovep@chromium.org</owner> <owner>eladalon@chromium.org</owner> <owner>kron@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/password/histograms.xml b/tools/metrics/histograms/metadata/password/histograms.xml index 171d5b88..8b002e69 100644 --- a/tools/metrics/histograms/metadata/password/histograms.xml +++ b/tools/metrics/histograms/metadata/password/histograms.xml
@@ -2421,7 +2421,7 @@ </histogram> <histogram name="PasswordManager.MergeSyncData.UpdateLoginSyncError" - enum="PasswordUpdateLoginSyncError" expires_after="2025-11-06"> + enum="PasswordUpdateLoginSyncError" expires_after="2026-11-06"> <owner>mamir@chromium.org</owner> <owner>mastiz@chromium.org</owner> <summary>
diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json index 7363eaa..ac1d226 100644 --- a/tools/perf/core/perfetto_binary_roller/binary_deps.json +++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json
@@ -5,8 +5,8 @@ "full_remote_path": "perfetto-luci-artifacts/v52.0/linux-arm64/trace_processor_shell" }, "win": { - "hash": "8daa1224c67cf8d8555ed7fba19aa6af302c5fda", - "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/win/8c69df2227b64fabc3f208081080645214513739/trace_processor_shell.exe" + "hash": "b01e84993253e907ef6dbbc1eeb1480780203dff", + "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/win/95317c91aadc41a24abc2a671b211baec3d6d749/trace_processor_shell.exe" }, "linux_arm": { "hash": "46d798c1864490cbb2ee053d6eda436184470e69", @@ -21,8 +21,8 @@ "full_remote_path": "perfetto-luci-artifacts/ebf44e57a3b734c5281bdff53d9945805486004e/mac-arm64/trace_processor_shell" }, "linux": { - "hash": "1db867430bba47467721eefc63d284d4694bafca", - "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/linux/8c69df2227b64fabc3f208081080645214513739/trace_processor_shell" + "hash": "a6ee4e46272bdb4fa2327658c4c2b3800d96128e", + "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/linux/95317c91aadc41a24abc2a671b211baec3d6d749/trace_processor_shell" } }, "power_profile.sql": {
diff --git a/ui/base/dragdrop/os_exchange_data_provider.h b/ui/base/dragdrop/os_exchange_data_provider.h index 2ffe5c50..9bf0679 100644 --- a/ui/base/dragdrop/os_exchange_data_provider.h +++ b/ui/base/dragdrop/os_exchange_data_provider.h
@@ -27,7 +27,12 @@ #if defined(USE_AURA) || BUILDFLAG(IS_APPLE) #include "ui/gfx/geometry/vector2d.h" -#include "ui/gfx/image/image_skia.h" +#endif + +#if defined(USE_AURA) || BUILDFLAG(IS_APPLE) +namespace gfx { +class ImageSkia; +} #endif namespace ui {
diff --git a/ui/base/metadata/base_type_conversion.h b/ui/base/metadata/base_type_conversion.h index a3d8bf9..ef158d0 100644 --- a/ui/base/metadata/base_type_conversion.h +++ b/ui/base/metadata/base_type_conversion.h
@@ -409,6 +409,34 @@ } } +template <typename T> +concept ClassHasToString = requires(T t) { + { t.ToString() } -> std::same_as<std::string>; +}; + +template <typename T> +concept ClassHasFromString = requires(T t, std::string_view sv) { + { T::FromString(sv) } -> std::same_as<std::optional<T>>; +}; + +template <ClassHasToString T> +struct TypeConverter<T> + : BaseTypeConverter<ClassHasFromString<T>, !ClassHasFromString<T>> { + static std::u16string ToString(ui::metadata::ArgType<T> source_value) { + return base::UTF8ToUTF16(source_value.ToString()); + } + + static std::optional<T> FromString(const std::u16string& source_value) { + if constexpr (ClassHasFromString<T>) { + return T::FromString(base::UTF16ToUTF8(source_value)); + } + + return std::nullopt; + } + + static ValidStrings GetValidStrings() { return {}; } +}; + } // namespace metadata } // namespace ui
diff --git a/ui/base/metadata/base_type_conversion_unittest.cc b/ui/base/metadata/base_type_conversion_unittest.cc index 20c14cf..6068034 100644 --- a/ui/base/metadata/base_type_conversion_unittest.cc +++ b/ui/base/metadata/base_type_conversion_unittest.cc
@@ -254,3 +254,26 @@ ui::metadata::TypeConverter<std::optional<const char*>>::is_serializable); EXPECT_TRUE(ui::metadata::TypeConverter<std::optional<int>>::is_serializable); } + +TEST_F(TypeConversionTest, CheckClassHasToString) { + class ToStringTestClassA { + public: + std::string ToString() const { return "test string"; } + }; + + // Test types with explicitly added converters. + EXPECT_FALSE( + ui::metadata::TypeConverter<ToStringTestClassA>::is_serializable); + EXPECT_TRUE(ui::metadata::TypeConverter<ToStringTestClassA>::is_read_only); + + class ToStringTestClassB { + public: + static std::optional<ToStringTestClassB> FromString(std::string_view sv) { + return ToStringTestClassB(); + } + std::string ToString() const { return "test string b"; } + }; + + EXPECT_TRUE(ui::metadata::TypeConverter<ToStringTestClassB>::is_serializable); + EXPECT_FALSE(ui::metadata::TypeConverter<ToStringTestClassB>::is_read_only); +}
diff --git a/ui/base/models/image_model.h b/ui/base/models/image_model.h index 0abb056..a6906680 100644 --- a/ui/base/models/image_model.h +++ b/ui/base/models/image_model.h
@@ -16,9 +16,9 @@ #include "ui/gfx/color_palette.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/image/image_skia.h" namespace gfx { +class ImageSkia; struct VectorIcon; } // namespace gfx
diff --git a/ui/base/models/image_model_unittest.cc b/ui/base/models/image_model_unittest.cc index 93ef595b..02fd231d 100644 --- a/ui/base/models/image_model_unittest.cc +++ b/ui/base/models/image_model_unittest.cc
@@ -10,6 +10,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/color/color_id.h" #include "ui/color/color_provider.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_unittest_util.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/vector_icon_types.h"
diff --git a/ui/base/themed_vector_icon.cc b/ui/base/themed_vector_icon.cc index 949c299f..87dfc14 100644 --- a/ui/base/themed_vector_icon.cc +++ b/ui/base/themed_vector_icon.cc
@@ -6,6 +6,7 @@ #include "ui/color/color_provider.h" #include "ui/color/color_variant.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/vector_icon_types.h" #include "ui/gfx/vector_icon_utils.h"
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h index e247b969..09eea04 100644 --- a/ui/gfx/canvas.h +++ b/ui/gfx/canvas.h
@@ -20,7 +20,6 @@ #include "cc/paint/skottie_color_map.h" #include "cc/paint/skottie_frame_data.h" #include "cc/paint/skottie_text_property_value.h" -#include "ui/gfx/image/image_skia.h" #include "ui/gfx/native_ui_types.h" #include "ui/gfx/text_constants.h" @@ -33,6 +32,8 @@ class Rect; class RectF; class FontList; +class ImageSkia; +class ImageSkiaRep; class Point; class PointF; class Size;
diff --git a/ui/gfx/paint_vector_icon.h b/ui/gfx/paint_vector_icon.h index 7c4ab54..8eb7ac9c 100644 --- a/ui/gfx/paint_vector_icon.h +++ b/ui/gfx/paint_vector_icon.h
@@ -9,11 +9,11 @@ #include "base/memory/raw_ref.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/color_palette.h" -#include "ui/gfx/image/image_skia.h" namespace gfx { class Canvas; +class ImageSkia; struct VectorIcon; // Describes an instance of an icon: an icon definition and a set of drawing
diff --git a/ui/gl/gl_utils.h b/ui/gl/gl_utils.h index 812cbda..95f5e4b2 100644 --- a/ui/gl/gl_utils.h +++ b/ui/gl/gl_utils.h
@@ -45,7 +45,6 @@ bool disable_d3d11 = false; bool disable_metal = false; bool disable_es3gl_context = false; - bool disable_es3gl_context_for_testing = false; bool disable_direct_composition_video_overlays = false; bool disable_vp_auto_hdr = false; };
diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h index 8efaccf..0a51ae7 100644 --- a/ui/views/controls/button/label_button.h +++ b/ui/views/controls/button/label_button.h
@@ -17,7 +17,6 @@ #include "ui/color/color_id.h" #include "ui/color/color_variant.h" #include "ui/gfx/geometry/rounded_corners_f.h" -#include "ui/gfx/image/image_skia.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/label_button_image_container.h" #include "ui/views/controls/button/label_button_label.h" @@ -36,6 +35,10 @@ class ActionItem; } +namespace gfx { +class ImageSkia; +} + namespace views { class InkDropContainerView;
diff --git a/v8 b/v8 index f92236e..4cfbba3 160000 --- a/v8 +++ b/v8
@@ -1 +1 @@ -Subproject commit f92236e339d6b28768f13fe7e17a3e466cfe0e6d +Subproject commit 4cfbba3684e7d04a5d46c9f9a2117f84e02ef5ca