Revert "[Media Router] Converts integration tests to run on Chromium waterfall."

This reverts commit aa57fe6d.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 543005 as the
culprit for failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2FhNTdmZTZkYzk2YjQwYTU4YWNjMWVkNmMyNjhmNDdhODgxYjU5MGUM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.memory/Linux%20MSan%20Tests/8508

Sample Failed Step: browser_tests

Original change's description:
> [Media Router] Converts integration tests to run on Chromium waterfall.
> 
> This updates the Media Router integration tests so they run in the
> Chromium waterfall with the open source Media Router component
> extension and its mock (test) Media Route Provider.
> 
> Additional changes:
> 
> - Removes extension from top level BUILD.gn as it is only used for
>   browser tests at the moment.
> - Splits the targets for Media Router browser tests into integration tests
>   (part of main browser_tests suite), e2e tests (which require the
>   external component extension), perf tests, and shared support code.
> - Renames the "test" extension to the "telemetry" extension used for perf
>   tests to avoid confusion.
> - Updates README files
> - One test is not compatible with the Chromium component and need
>   to be fixed.  Bugs 818767 filed for follow-up.
> 
> Bug: 698796
> Change-Id: I6cc9302ffd72de95630ce33ca3617b3b73b9e722
> Reviewed-on: https://chromium-review.googlesource.com/917214
> Commit-Queue: mark a. foltz <mfoltz@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Derek Cheng <imcheng@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#543005}

Change-Id: Ifd1f688a7b89397491d849a6766f8d0510425e05
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 698796
Reviewed-on: https://chromium-review.googlesource.com/962101
Cr-Commit-Position: refs/heads/master@{#543034}

BUILD.gn

@@ -92,6 +92,7 @@ group("gn_all") {
   if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) {
     deps += [
       "//chrome",
+      "//chrome/browser/resources/media_router/extension:all",
       "//chrome/test:browser_tests",
       "//chrome/test:interactive_ui_tests",
       "//chrome/test:sync_integration_tests",

chrome/test/BUILD.gn

@@ -1326,7 +1326,7 @@ test("browser_tests") {
 
       deps += [
         "//chrome/common/extensions/api",
-        "//chrome/test/media_router:browser_tests",
+        "//chrome/test/media_router:media_router_browsertests",
         "//components/guest_view/browser:test_support",
         "//components/keep_alive_registry",
 

chrome/test/media_router/BUILD.gn

@@ -2,151 +2,93 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("browser_tests") {
+group("media_router_perf_tests") {
   testonly = true
-  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-  sources = [
-    "media_router_e2e_browsertest.cc",
-    "media_router_e2e_browsertest.h",
-    "media_router_e2e_ui_browsertest.cc",
-    "media_router_integration_browsertest.cc",
-    "media_router_integration_browsertest.h",
-    "media_router_integration_ui_browsertest.cc",
-    "media_router_one_ua_integration_browsertest.cc",
+  data = [
+    "$root_out_dir/media_router/test_extension/",
+    "$root_out_dir/mr_extension/release/",
+    "internal/",
+    "telemetry/",
   ]
   deps = [
-    ":test_support",
-    "//chrome/app:generated_resources",
-    "//chrome/browser",
-    "//chrome/browser/media/router",
-    "//chrome/browser/ui",
-    "//chrome/common",
-    "//chrome/common/media_router:router",
-    "//chrome/test:test_support_ui",
-    "//content/public/browser",
-    "//content/test:test_support",
-    "//media:test_support",
-    "//net",
-    "//net:test_support",
-    "//testing/gtest",
-    "//ui/base",
-    "//url",
-  ]
-  data_deps = [
-    ":browser_test_resources",
-    "//chrome/browser/resources/media_router/extension:media_router",
-  ]
-  data = [ "$root_gen_dir/chrome/browser/resources/media_router/extension/" ]
-}
-
-copy("browser_test_resources") {
-  testonly = true
-  sources = [
-    "resources/basic_test.html",
-    "resources/close_route_with_error_on_send.json",
-    "resources/common.js",
-    "resources/fail_create_route.json",
-    "resources/fail_reconnect_session.html",
-    "resources/fail_reconnect_session.json",
-    "resources/local_media_sink.json",
-    "resources/local_media_sink_route_fail.json",
-    "resources/no_provider.json",
-    "resources/no_sinks.json",
-    "resources/no_supported_sinks.json",
-    "resources/presentation_receiver.html",
-    "resources/route_creation_timed_out.json",
-  ]
-  outputs = [
-    "$root_out_dir/media_router/browser_test_resources/{{source_file_part}}",
+    ":test_extension_resource_files",
+    "//tools/perf:perf",
   ]
 }
 
-# Run separately from the Chromium waterfall with the external component
-# extension.  See README.md
-group("media_router_e2e_tests") {
+group("media_router_tests") {
   testonly = true
   data_deps = [
-    ":browser_test_resources",
-    ":e2e_test_resources",
     "//chrome/test:browser_tests",
   ]
   data = [
     "$root_out_dir/mr_extension/",
+    "internal/",
+    "../../../media/test/data/player.html",
+    "../../../media/test/data/bear-vp9.webm",
   ]
 }
 
-copy("e2e_test_resources") {
-  testonly = true
-  sources = [
-    "../../../media/test/data/bear-vp9.webm",
-    "../../../media/test/data/player.html",
-  ]
+# Browser test resource files.
+media_router_integration_test_resources = [
+  "resources/basic_test.html",
+  "resources/close_route_with_error_on_send.json",
+  "resources/common.js",
+  "resources/fail_create_route.json",
+  "resources/fail_reconnect_session.html",
+  "resources/fail_reconnect_session.json",
+  "resources/local_media_sink.json",
+  "resources/local_media_sink_route_fail.json",
+  "resources/no_provider.json",
+  "resources/no_sinks.json",
+  "resources/no_supported_sinks.json",
+  "resources/presentation_receiver.html",
+  "resources/route_creation_timed_out.json",
+]
+
+media_router_test_extension_resources = [
+  "telemetry/extension/manifest.json",
+  "telemetry/extension/script.js",
+]
+
+copy("test_extension_resource_files") {
+  sources = media_router_test_extension_resources
   outputs = [
-    "$root_out_dir/media_router/browser_test_resources/{{source_file_part}}",
+    "$root_out_dir/media_router/test_extension/{{source_file_part}}",
   ]
 }
 
-# Run separately.  TODO: Documentation on how to run
-group("swarming_tests") {
-  testonly = true
-  data_deps = [
-    ":browser_test_resources",
-    "//chrome/test:browser_tests",
-  ]
-  data = [
-    "internal/",
-    "$root_out_dir/mr_extension/",
+copy("browser_tests_resource_files") {
+  sources = media_router_integration_test_resources
+  outputs = [
+    "$root_out_dir/media_router/browser_test_resources/{{source_file_part}}",
   ]
 }
 
-source_set("test_support") {
+source_set("media_router_browsertests") {
   testonly = true
+  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
   sources = [
     "media_router_base_browsertest.cc",
     "media_router_base_browsertest.h",
+    "media_router_e2e_browsertest.cc",
+    "media_router_e2e_browsertest.h",
+    "media_router_e2e_ui_browsertest.cc",
+    "media_router_integration_browsertest.cc",
+    "media_router_integration_browsertest.h",
+    "media_router_integration_ui_browsertest.cc",
+    "media_router_one_ua_integration_browsertest.cc",
     "test_media_sinks_observer.cc",
     "test_media_sinks_observer.h",
   ]
-  public_deps = [
-    "//base",
-    "//chrome/browser/extensions",
-    "//extensions/browser",
-  ]
   deps = [
-    "//chrome/browser/media/router",
+    ":browser_tests_resource_files",
     "//chrome/browser/media/router:test_support",
-    "//chrome/common:constants",
     "//chrome/test:test_support",
     "//chrome/test:test_support_ui",
-    "//content/public/common",
-    "//content/test:test_support",
-    "//extensions/common",
+    "//extensions/browser",
+    "//media:test_support",
+    "//skia",
     "//testing/gtest",
   ]
 }
-
-group("media_router_perf_tests") {
-  testonly = true
-  data = [
-    "$root_out_dir/media_router/telemetry_extension/",
-    "$root_out_dir/mr_extension/release/",
-    "internal/",
-    "telemetry/",
-  ]
-  deps = [
-    "//tools/perf:perf",
-  ]
-  data_deps = [
-    ":telemetry_extension_resources",
-  ]
-}
-
-copy("telemetry_extension_resources") {
-  sources = [
-    "telemetry/extension/manifest.json",
-    "telemetry/extension/script.js",
-  ]
-  outputs = [
-    "$root_out_dir/media_router/telemetry_extension/{{source_file_part}}",
-  ]
-}

chrome/test/media_router/README.md

@@ -6,39 +6,22 @@
 # Media Router Integration and E2E Browser Tests
 
 This directory contains the integration and end-to-end browser tests for Media
-Router.  The Media Router uses various Media Route Providers to connect to
-different types of displays.
+Router. Note that running these tests requires a dev build of the Media Router
+component extension, which isn't open source. The project for upstreaming the
+component extension is [tracked by this bug](http://crbug.com/698796).
 
-## Media Route Providers
-
-The tests are run with one of two component extensions:
-
-* The open source Media Router component extension in
-  chrome/browser/resources/media_router/extension includes a mock Media Route
-  Provider, `mr.TestProvider`.
-* The closed source Media Router external component extension includes the Cast
-  Media Route Provider.
-
-## Tests
+## Test classes
 
 * `MediaRouterIntegrationBrowserTest`: Tests that Media Router behaves as
-specified by the Presentation API, and that its dialog is shown as expected
-using the test provider `mr.TestProvider`. Test cases that specifically test the
-functionalities of the Media Router dialog are in
-`media_router_integration_ui_browsertest.cc`.
+specified by the Presentation API, and that its dialog is shown as expected.
+Uses `mr.TestProvider` (provided the component extension) as the Media Route
+Provider. Test cases that specifically test the functionalities of the Media
+Router dialog are in `media_router_integration_ui_browsertest.cc`.
 
 * `MediaRouterIntegrationIncognitoBrowserTest`: Same as
 `MediaRouterIntegrationBrowserTest`, except for that the tests are run using an
 incognito profile.
 
-* `MediaRouterE2EBrowserTest`: Tests Chromecast-specific functionality of Media
-Router using the Cast Media Route Provider.  Requires installing the Media
-Router external component extension and an actual Chromecast device.
-
-* `MediaRouterIntegrationOneUABrowserTest`: Tests that the Presentation API can
-be used to start presentations using offscreen tabs, and that basic Presentation
-API usage with offscreen tabs is working.
-
-* `MediaRouterIntegrationOneUANoReceiverBrowserTest`: Tests Presentation API
-behavior when there is no compatible presentation receiver for the requested
-URL.
+* `MediaRouterE2EBrowserTest`: Tests the casting functionality of Media Router
+using the Cast Media Route Provider (provided by the component extension) and an
+actual Chromecast device.

chrome/test/media_router/media_router_base_browsertest.cc

@@ -113,12 +113,12 @@ void MediaRouterBaseBrowserTest::ParseCommandLine() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   extension_unpacked_ = command_line->GetSwitchValuePath(kExtensionUnpacked);
 
-  // No extension provided. Use the default component extension in Chromium.
+  // Check if there is mr_extension folder under PRODUCT_DIR folder.
   if (extension_unpacked_.empty()) {
     base::FilePath base_dir;
     ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &base_dir));
-    base::FilePath extension_path = base_dir.Append(FILE_PATH_LITERAL(
-        "gen/chrome/browser/resources/media_router/extension"));
+    base::FilePath extension_path =
+        base_dir.Append(FILE_PATH_LITERAL("mr_extension/"));
     if (PathExists(extension_path)) {
       extension_unpacked_ = extension_path;
     }

chrome/test/media_router/media_router_integration_browsertest.cc

@@ -699,14 +699,13 @@ void MediaRouterIntegrationBrowserTest::RunReconnectSessionSameTabTest() {
   ASSERT_EQ(session_id, reconnected_session_id);
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, Basic) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Basic) {
   RunBasicTest();
 }
 
 // Tests that creating a route with a local file opens the file in a new tab.
-// TODO(crbug.com/818767): Fails when run with Chromium component.
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       DISABLED_OpenLocalMediaFileInCurrentTab) {
+                       MANUAL_OpenLocalMediaFileInCurrentTab) {
   // Start at a new tab, the file should open in the same tab.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   // Make sure there is 1 tab.
@@ -726,7 +725,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
 
 // Tests that creating a route with a local file opens the file in a new tab.
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       OpenLocalMediaFileInNewTab) {
+                       MANUAL_OpenLocalMediaFileInNewTab) {
   // Start at a tab with content in it, the file will open in a new tab.
   ui_test_utils::NavigateToURL(browser(), GURL("http://google.com"));
   // Make sure there is 1 tab.
@@ -746,7 +745,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
 
 // Tests that failing to create a route with a local file shows an issue.
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       OpenLocalMediaFileFailsAndShowsIssue) {
+                       MANUAL_OpenLocalMediaFileFailsAndShowsIssue) {
   OpenDialogAndCastFileFails();
   // Expect that the issue is showing.
   ASSERT_TRUE(IsUIShowingIssue());
@@ -754,7 +753,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
 
 // Tests that creating a route with a local file opens in fullscreen.
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       OpenLocalMediaFileFullscreen) {
+                       MANUAL_OpenLocalMediaFileFullscreen) {
   // Start at a new tab, the file should open in the same tab.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   // Make sure there is 1 tab.
@@ -777,7 +776,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
 
 // Tests that failed route creation of local file does not enter fullscreen.
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       OpenLocalMediaFileCastFailNoFullscreen) {
+                       MANUAL_OpenLocalMediaFileCastFailNoFullscreen) {
   // Start at a new tab, the file should open in the same tab.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   // Make sure there is 1 tab.
@@ -797,11 +796,12 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
       web_contents->GetDelegate()->IsFullscreenForTabOrPending(web_contents));
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, SendAndOnMessage) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
+                       MANUAL_SendAndOnMessage) {
   RunSendMessageTest("foo");
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, CloseOnError) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_CloseOnError) {
   SetTestData(FILE_PATH_LITERAL("close_route_with_error_on_send.json"));
   WebContents* web_contents = StartSessionWithTestPageAndChooseSink();
   CheckSessionValidity(web_contents);
@@ -809,29 +809,33 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, CloseOnError) {
                        kSendMessageAndExpectConnectionCloseOnErrorScript);
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, Fail_SendMessage) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
+                       MANUAL_Fail_SendMessage) {
   RunFailToSendMessageTest();
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, Fail_NoProvider) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
+                       MANUAL_Fail_NoProvider) {
   SetTestData(FILE_PATH_LITERAL("no_provider.json"));
   WebContents* web_contents = StartSessionWithTestPageAndChooseSink();
   CheckStartFailed(web_contents, "UnknownError",
                    "No provider supports createRoute with source");
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, Fail_CreateRoute) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
+                       MANUAL_Fail_CreateRoute) {
   SetTestData(FILE_PATH_LITERAL("fail_create_route.json"));
   WebContents* web_contents = StartSessionWithTestPageAndChooseSink();
   CheckStartFailed(web_contents, "UnknownError", "Unknown sink");
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, ReconnectSession) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
+                       MANUAL_ReconnectSession) {
   RunReconnectSessionTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       Fail_ReconnectSession) {
+                       MANUAL_Fail_ReconnectSession) {
   WebContents* web_contents = StartSessionWithTestPageAndChooseSink();
   CheckSessionValidity(web_contents);
   std::string session_id(GetStartedConnectionId(web_contents));
@@ -846,20 +850,21 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
                          session_id.c_str()));
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, Fail_StartCancelled) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
+                       MANUAL_Fail_StartCancelled) {
   WebContents* web_contents = StartSessionWithTestPageAndSink();
   GetControllerForShownDialog(web_contents)->HideMediaRouterDialog();
   CheckStartFailed(web_contents, "NotAllowedError", "Dialog closed.");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       Fail_StartCancelledNoSinks) {
+                       MANUAL_Fail_StartCancelledNoSinks) {
   SetTestData(FILE_PATH_LITERAL("no_sinks.json"));
   StartSessionAndAssertNotFoundError();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       Fail_StartCancelledNoSupportedSinks) {
+                       MANUAL_Fail_StartCancelledNoSupportedSinks) {
   SetTestData(FILE_PATH_LITERAL("no_supported_sinks.json"));
   StartSessionAndAssertNotFoundError();
 }
@@ -882,12 +887,13 @@ Browser* MediaRouterIntegrationIncognitoBrowserTest::browser() {
   return incognito_browser_;
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationIncognitoBrowserTest, Basic) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationIncognitoBrowserTest,
+                       MANUAL_Basic) {
   RunBasicTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationIncognitoBrowserTest,
-                       ReconnectSession) {
+                       MANUAL_ReconnectSession) {
   RunReconnectSessionTest();
 }
 

chrome/test/media_router/media_router_integration_ui_browsertest.cc

@@ -18,7 +18,7 @@ namespace {
 const char kTestSinkName[] = "test-sink-1";
 }
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, Dialog_Basic) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {
   OpenTestPage(FILE_PATH_LITERAL("basic_test.html"));
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
@@ -134,7 +134,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, Dialog_Basic) {
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
-                       Dialog_RouteCreationTimedOut) {
+                       MANUAL_Dialog_RouteCreationTimedOut) {
   SetTestData(FILE_PATH_LITERAL("route_creation_timed_out.json"));
   OpenTestPage(FILE_PATH_LITERAL("basic_test.html"));
   content::WebContents* web_contents =

chrome/test/media_router/media_router_one_ua_integration_browsertest.cc

@@ -42,34 +42,34 @@ class MediaRouterIntegrationOneUABrowserTest
   }
 };
 
-IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest, Basic) {
+IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest, MANUAL_Basic) {
   RunBasicTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
-                       SendAndOnMessage) {
+                       MANUAL_SendAndOnMessage) {
   RunSendMessageTest("foo");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
-                       ReceiverCloseConnection) {
+                       MANUAL_ReceiverCloseConnection) {
   WebContents* web_contents = StartSessionWithTestPageAndChooseSink();
   CheckSessionValidity(web_contents);
   ExecuteJavaScriptAPI(web_contents, kInitiateCloseFromReceiverPageScript);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
-                       Fail_SendMessage) {
+                       MANUAL_Fail_SendMessage) {
   RunFailToSendMessageTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
-                       ReconnectSession) {
+                       MANUAL_ReconnectSession) {
   RunReconnectSessionTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUABrowserTest,
-                       ReconnectSessionSameTab) {
+                       MANUAL_ReconnectSessionSameTab) {
   RunReconnectSessionSameTabTest();
 }
 
@@ -83,22 +83,22 @@ class MediaRouterIntegrationOneUANoReceiverBrowserTest
 };
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUANoReceiverBrowserTest,
-                       Basic) {
+                       MANUAL_Basic) {
   RunBasicTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUANoReceiverBrowserTest,
-                       Fail_SendMessage) {
+                       MANUAL_Fail_SendMessage) {
   RunFailToSendMessageTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUANoReceiverBrowserTest,
-                       ReconnectSession) {
+                       MANUAL_ReconnectSession) {
   RunReconnectSessionTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationOneUANoReceiverBrowserTest,
-                       ReconnectSessionSameTab) {
+                       MANUAL_ReconnectSessionSameTab) {
   RunReconnectSessionSameTabTest();
 }
 

chrome/test/media_router/telemetry/README.md

@@ -3,25 +3,13 @@
      found in the LICENSE file.
 -->
 
-# How to run benchmarks for Media Router
-1. Run the following command to find all the available browsers:
-
-```shell
+# How to run benchmarks for media router
+1. Run the following command to find all the avaiable browsers:
 ./chrome/test/media_router/telemetry/run_benchmark --browser list
-```
-
-Let `<browser>` be one of the results.
 
 2. Run the following command to get benchmarks for media router dialog latency:
+./chrome/test/media_router/telemetry/run_benchmark --browser=<one of the values returned in step 1> media_router.dialog.latency.tracing --reset-results
 
-```shell
-./chrome/test/media_router/telemetry/run_benchmark --browser=<browser> \
-    media_router.dialog.latency.tracing --reset-results
-
-./chrome/test/media_router/telemetry/run_benchmark --browser=<browser> \
-    media_router.dialog.latency.histogram
-```
-
-The results will be in
-`<chromium src folder>/chrome/test/media_router/telemetry/results.html`
+./chrome/test/media_router/telemetry/run_benchmark --browser=<one of the values returned in step 1> media_router.dialog.latency.histogram
 
+The results will be in <chromium src folder>/chrome/test/media_router/telemetry/results.html

chrome/test/media_router/telemetry/benchmarks/media_router_benchmark.py

@@ -31,7 +31,7 @@ class _BaseCastBenchmark(perf_benchmark.PerfBenchmark):
             os.path.join(path_util.GetChromiumSrcDir(), 'out',
             'Release', 'mr_extension', 'release'),
              os.path.join(path_util.GetChromiumSrcDir(), 'out',
-             'Release', 'media_router', 'telemetry_extension')]),
+             'Release', 'media_router', 'test_extension')]),
         '--whitelisted-extension-id=enhhojjnijigcajfphajepfemndkmdlo',
         '--media-router=1',
         '--enable-stats-collection-bindings'

chrome/test/media_router/telemetry/extension/README.md

-This is the test extension which is used to get CPU/memory usage for Media
-Router performance test.
+This is the test extension which is used to get CPU/memory usage for media router performance test.
 
-`chrome/test/media_router/telemetry/benchmarks/pagesets/cpu_memory_script.js`
-shows how to interact with this test extension to get CPU/memory usage.
+chrome/test/media_router/telemetry/benchmarks/pagesets/cpu_memory_script.js shows how to interact with this test extension to get CPU/memory usage.

testing/buildbot/filters/mash.browser_tests.filter

@@ -276,11 +276,3 @@
 
 # Flaky segfaults: https://crbug.com/818147
 -ExtensionApiTest.BookmarkManager
-
-# Depends on chrome/browser/media/webrtc; CHECKs in ash::Shell::Get()
-# https://crbug.com/723880
--MediaRouterIntegrationBrowserTest.*
--MediaRouterIntegrationOneUABrowserTest.*
--MediaRouterIntegrationOneUANoReceiverBrowserTest.*
-
-

testing/buildbot/gn_isolate_map.pyl

@@ -784,7 +784,7 @@
     ],
   },
   "media_router_tests": {
-    "label": "//chrome/test/media_router:media_router_e2e_tests",
+    "label": "//chrome/test/media_router:media_router_tests",
     "type": "script",
     "script": "//chrome/test/media_router/internal/media_router_tests.py",
     "args": [