[Media Router] Further split media_router_container tests.

chrome/test/data/webui/media_router/media_router_elements_browsertest.js

Index: chrome/test/data/webui/media_router/media_router_elements_browsertest.js
diff --git a/chrome/test/data/webui/media_router/media_router_elements_browsertest.js b/chrome/test/data/webui/media_router/media_router_elements_browsertest.js
index eae673a463ab3d7c99c215b128c612e2b6b0a859..54030a5b69d681793810d674884b677ec35e1376 100644
--- a/chrome/test/data/webui/media_router/media_router_elements_browsertest.js
+++ b/chrome/test/data/webui/media_router/media_router_elements_browsertest.js
@@ -39,7 +39,8 @@ MediaRouterElementsBrowserTest.prototype = {
   // media_router_container_filter_tests.js.
   extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
     'issue_banner_tests.js',
-    'media_router_container_tests.js',
+    'media_router_container_part_one_tests.js',
+    'media_router_container_part_two_tests.js',
     'media_router_container_filter_tests.js',
     'media_router_header_tests.js',
     'media_router_search_highlighter.js',
@@ -91,53 +92,53 @@ TEST_F('MediaRouterElementsBrowserTest', 'MediaRouterElementsTestIssueBanner',
   mocha.run();
 });
 
-// See bugs.chromium.org issue 591227
+// The media_router_container tests are being split into multiple parts due to
+// timeout issues on bots. The tests are separated such that their runtimes are
+// similar, not necessarily to separate smaller logical units.
 TEST_F('MediaRouterElementsBrowserTest',
-    'DISABLED_MediaRouterElementsTestMediaRouterContainer',
+    'MediaRouterElementsTestMediaRouterContainerPartOne',
     function() {
-  // Register mocha tests for the container.
-  media_router_container.registerTests();
+  media_router_container_part_one.registerTests();
+
+  mocha.run();
+});
+
+TEST_F('MediaRouterElementsBrowserTest',
+    'MediaRouterElementsTestMediaRouterContainerPartTwo',
+    function() {
+  media_router_container_part_two.registerTests();
 
-  // Run all registered tests.
   mocha.run();
 });
 
 TEST_F('MediaRouterElementsBrowserTest',
     'MediaRouterElementsTestMediaRouterContainerFilter',
     function() {
-  // Register mocha tests for the container filter.
   media_router_container_filter.registerTests();
 
-  // Run all registered tests.
   mocha.run();
 });
 
 TEST_F('MediaRouterElementsBrowserTest',
     'MediaRouterElementsTestMediaRouterHeader',
     function() {
-  // Register mocha tests for the header.
   media_router_header.registerTests();
 
-  // Run all registered tests.
   mocha.run();
 });
 
 TEST_F('MediaRouterElementsBrowserTest',
     'MediaRouterElementsTestMediaRouterSearchHighlighter',
     function() {
-  // Register mocha tests for the search highlighter.
   media_router_search_highlighter.registerTests();
 
-  // Run all registered tests.
   mocha.run();
 });
 
 TEST_F('MediaRouterElementsBrowserTest',
     'MediaRouterElementsTestMediaRouterRouteDetails',
     function() {
-  // Register mocha tests for the route details.
   route_details.registerTests();
 
-  // Run all registered tests.
   mocha.run();
 });