0

media: Fold media_service_unittests into media_unittests

Historically media_service_unittests needs a different test runner and
involves a standalone binary with it's main() function and mojo
manifest file. So we had put the tests in its own test target.

After several redesign and refactoring, now these tests are just normal
unit tests. There's no reason to treat them separately anymore.

This CL folds media_service_unittests into media_unittests to simplify
our test code.

Bug: 1062194
Change-Id: I62ae08706b755622fd348189ecc87192e5e4b797
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2118582
Reviewed-by: John Rummell <jrummell@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754135}
This commit is contained in:
Xiaohan Wang
2020-03-27 20:05:13 +00:00
committed by Commit Bot
parent c9f4759554
commit 5e2c87a1fb
20 changed files with 15 additions and 4104 deletions

@ -695,16 +695,7 @@ group("gn_all") {
}
if (is_win || is_linux) {
deps += [
"//media/mojo/services:media_service_unittests",
"//mojo",
]
# crbug.com/676055: media_service_unittests fails to link under Windows
# component builds, due to duplicate symbol definitions.
if (is_win && is_component_build) {
deps -= [ "//media/mojo/services:media_service_unittests" ]
}
deps += [ "//mojo" ]
}
if (is_mac || is_linux || is_android || is_fuchsia) {
@ -1017,9 +1008,7 @@ if (!is_ios) {
"//chrome:chrome",
"//chrome/test/chromedriver",
]
deps = [
"//third_party/blink/tools:wpt_tests_isolate",
]
deps = [ "//third_party/blink/tools:wpt_tests_isolate" ]
}
}

@ -14,7 +14,7 @@ jumbo_source_set("clients") {
"//content/renderer:*",
# TODO(xhwang): Only allow //media/mojo/services:media_service_unittests
# TODO(xhwang): Only allow //media/mojo/services:unit_tests
"//media/mojo/services:*",
"//media/mojo:test_support",

@ -161,6 +161,7 @@ source_set("unit_tests") {
sources = [
"deferred_destroy_unique_receiver_set_unittest.cc",
"media_metrics_provider_unittest.cc",
"media_service_unittest.cc",
"mojo_audio_input_stream_unittest.cc",
"mojo_audio_output_stream_provider_unittest.cc",
"mojo_audio_output_stream_unittest.cc",
@ -173,21 +174,29 @@ source_set("unit_tests") {
]
deps = [
":services",
"//base",
"//base/test:test_support",
"//components/ukm:test_support",
"//media:test_support",
"//media/cdm:cdm_paths",
"//media/learning/common",
"//media/mojo:test_support",
"//media/mojo/clients",
"//media/mojo/common",
"//media/mojo/mojom",
"//mojo/core/embedder",
"//mojo/public/interfaces/bindings/tests:test_interfaces",
"//services/metrics/public/cpp:ukm_builders",
"//services/service_manager/public/cpp",
"//services/service_manager/public/cpp/test:test_support",
"//testing/gmock",
"//testing/gtest",
]
if (enable_library_cdms) {
sources += [
"cdm_service_unittest.cc",
"mojo_cdm_allocator_unittest.cc",
"mojo_cdm_file_io_unittest.cc",
"mojo_cdm_helper_unittest.cc",
@ -206,29 +215,3 @@ source_set("unit_tests") {
]
}
}
test("media_service_unittests") {
testonly = true
sources = [ "media_service_unittest.cc" ]
if (enable_library_cdms) {
sources += [ "cdm_service_unittest.cc" ]
}
deps = [
":services",
"//base",
"//base/test:test_support",
"//media:test_support",
"//media/cdm:cdm_paths",
"//media/mojo/clients",
"//media/mojo/common",
"//media/mojo/mojom",
"//mojo/core/test:run_all_unittests",
"//services/service_manager/public/cpp",
"//services/service_manager/public/cpp/test:test_support",
"//testing/gmock",
"//testing/gtest",
]
}

@ -121,11 +121,9 @@ ACTION_P(QuitLoop, run_loop) {
base::PostTask(FROM_HERE, run_loop->QuitClosure());
}
// Tests MediaService built into a standalone mojo service binary (see
// ServiceMain() in main.cc) where MediaService uses TestMojoMediaClient.
// TestMojoMediaClient supports CDM creation using DefaultCdmFactory (only
// supports Clear Key key system), and Renderer creation using
// DefaultRendererFactory that always create media::RendererImpl.
// Tests MediaService using TestMojoMediaClient, which supports CDM creation
// using DefaultCdmFactory (only supports Clear Key key system), and Renderer
// creation using DefaultRendererFactory that always create media::RendererImpl.
class MediaServiceTest : public testing::Test {
public:
MediaServiceTest()

@ -2807,25 +2807,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04",
"pool": "chrome.tests.template",
"ssd": "0"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],

@ -2066,25 +2066,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04",
"pool": "chrome.tests.template",
"ssd": "0"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],

@ -3604,65 +3604,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd.template",
"ssd": "1"
}
],
"named_caches": [
{
"name": "avd_generic_android23",
"path": ".android"
},
{
"name": "system_images_android_23_google_apis_x86",
"path": ".emulator_sdk"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -7872,65 +7813,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"cpu": "x86-64",
"device_os": null,
"device_type": null,
"os": "Ubuntu-16.04",
"pool": "chromium.tests.avd.template",
"ssd": "1"
}
],
"named_caches": [
{
"name": "avd_generic_android28",
"path": ".android"
},
{
"name": "system_images_android_28_google_apis_x86",
"path": ".emulator_sdk"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",

@ -3968,52 +3968,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -6827,53 +6781,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84Z",
"device_os_type": "userdebug",
"device_type": "flo",
"os": "Android"
}
],
"expiration": 10800,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -10145,53 +10052,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY48I",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"expiration": 10800,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -13455,53 +13315,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY49B",
"device_os_type": "userdebug",
"device_type": "flo",
"os": "Android"
}
],
"expiration": 21600,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -16915,52 +16728,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -20197,53 +19964,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MRA58Z",
"device_os_type": "userdebug",
"device_type": "flo",
"os": "Android"
}
],
"expiration": 10800,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -24628,52 +24348,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -29561,52 +29235,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -32814,52 +32442,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY48M",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -36103,53 +35685,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"isolate_coverage_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -40015,53 +39550,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",

@ -1741,23 +1741,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -3344,24 +3327,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"isolate_coverage_data": true,
"merge": {

File diff suppressed because it is too large Load Diff

@ -867,23 +867,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -2518,24 +2501,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -4221,24 +4186,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -6993,52 +6940,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -10298,52 +10199,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -12225,23 +12080,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -13852,26 +13690,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
@ -15459,23 +15277,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -16933,23 +16734,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -18392,23 +18176,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -19885,23 +19652,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -21379,23 +21129,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -22596,18 +22329,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -23924,21 +23645,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
@ -24962,18 +24668,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -26273,18 +25967,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -27509,18 +27191,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -28711,18 +28381,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -30291,24 +29949,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -32111,24 +31751,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -33931,24 +33553,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -35407,18 +35011,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -36643,18 +36235,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -37879,18 +37459,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -39115,18 +38683,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -40500,23 +40056,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -42093,23 +41632,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],

@ -1028,24 +1028,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.15"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -3225,17 +3207,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -4732,24 +4703,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-17134"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -8091,53 +8044,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"isolate_coverage_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -11044,54 +10950,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"isolate_coverage_data": true,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -31086,23 +30944,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -32119,26 +31960,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--enable-features=BlinkHeapConcurrentMarking"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--enable-features=BlinkHeapConcurrentMarking"
@ -32905,23 +32726,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -34187,24 +33991,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
@ -35767,23 +35553,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -37692,24 +37461,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
@ -39786,25 +39537,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
@ -41305,25 +41037,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.15"
}
],
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -43275,19 +42988,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"isolate_coverage_data": true,
"merge": {

@ -593,23 +593,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -1493,23 +1476,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -3760,24 +3726,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
@ -5695,23 +5643,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -7589,23 +7520,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],

@ -870,24 +870,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.10"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -2574,24 +2556,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -4278,24 +4242,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -6012,24 +5958,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -7753,24 +7681,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -9456,25 +9366,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
@ -11266,24 +11157,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.14.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],

@ -2095,52 +2095,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -4194,26 +4148,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
@ -5876,23 +5810,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -7501,26 +7418,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
@ -9366,27 +9263,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
@ -11248,27 +11124,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
@ -13011,26 +12866,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
@ -14408,21 +14243,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
@ -16725,52 +16545,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"media_service_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
@ -18693,23 +18467,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],

@ -1104,24 +1104,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],

@ -730,18 +730,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -2587,24 +2575,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -4670,24 +4640,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -6771,25 +6723,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"isolate_coverage_data": true,
"merge": {
@ -8665,18 +8598,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],
@ -10110,18 +10031,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],

@ -1195,10 +1195,6 @@
"script": "//tools/perf/contrib/media_router_benchmarks/run_benchmark.py",
"type": "script",
},
"media_service_unittests": {
"label": "//media/mojo/services:media_service_unittests",
"type": "console_test_launcher",
},
"media_unittests": {
"label": "//media:media_unittests",
"type": "windowed_test_launcher",

@ -698,7 +698,6 @@
'latency_unittests': {},
'libjingle_xmpp_unittests': {},
'media_blink_unittests': {},
'media_service_unittests': {},
'media_unittests': {},
'midi_unittests': {},
'mojo_unittests': {},

@ -855,24 +855,6 @@
"test": "media_blink_unittests",
"test_target": "//media/blink:media_blink_unittests"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13.6"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "media_service_unittests",
"test_target": "//media/mojo/services:media_service_unittests"
},
{
"merge": {
"args": [],