Improve the stability for e2e UI tests running in the lab.

Added a few more checks to verify the presence of MR dialog before performing different actions.
Also, reorder the test case to avoid the failure of terminating tests affect the next run.

Change-Id: Id5321e1af99e15863158879d323dcd37419197a2
Reviewed-on: https://chromium-review.googlesource.com/c/1278948
Commit-Queue: Clifford Cheng <cliffordcheng@chromium.org>
Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599390}

chrome/test/media_router/media_router_e2e_ui_browsertest.cc

@@ -14,46 +14,6 @@
 
 namespace media_router {
 
-IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest, MANUAL_MirrorHTML5Video) {
-  content::WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-
-  content::WebContents* dialog_contents = OpenMRDialog(web_contents);
-  ASSERT_TRUE(dialog_contents);
-
-  // Wait util the dialog finishes rendering.
-  WaitUntilDialogFullyLoaded(dialog_contents);
-  WaitUntilSinkDiscoveredOnUI();
-  ChooseSink(web_contents, receiver());
-
-  // Mirror tab for 10s.
-  Wait(base::TimeDelta::FromSeconds(10));
-  dialog_contents = OpenMRDialog(web_contents);
-  WaitUntilDialogFullyLoaded(dialog_contents);
-
-  // Check the mirroring session has started successfully.
-  ASSERT_TRUE(!GetRouteId(receiver()).empty());
-  OpenMediaPage();
-
-  // Play the video on loop and wait 5s for it to play smoothly.
-  std::string script = "document.getElementsByTagName('video')[0].loop=true;";
-  ExecuteScript(web_contents, script);
-  Wait(base::TimeDelta::FromSeconds(5));
-
-  // Go to full screen and wait 5s for it to play smoothly.
-  script = "document.getElementsByTagName('video')[0]."
-      "webkitRequestFullScreen();";
-  ExecuteScript(web_contents, script);
-  Wait(base::TimeDelta::FromSeconds(5));
-  dialog_contents = OpenMRDialog(web_contents);
-  WaitUntilDialogFullyLoaded(dialog_contents);
-
-  // Check the mirroring session is still live.
-  ASSERT_TRUE(!GetRouteId(receiver()).empty());
-  Wait(base::TimeDelta::FromSeconds(20));
-  CloseRouteOnUI();
-}
-
 IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest,
                        MANUAL_OpenLocalMediaFileFullscreen) {
   GURL file_url = ui_test_utils::GetTestUrl(
@@ -85,8 +45,8 @@ IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest,
   WaitUntilSinkDiscoveredOnUI();
   ChooseSink(web_contents, receiver());
 
-  // Play the file for 15 seconds.
-  Wait(base::TimeDelta::FromSeconds(15));
+  // Play the file for 10 seconds.
+  Wait(base::TimeDelta::FromSeconds(10));
 
   // Expect that the current tab has the file open in it.
   ASSERT_EQ(file_url, web_contents->GetURL());
@@ -98,7 +58,58 @@ IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest,
       "(document.webkitCurrentFullScreenElement != null);";
   CHECK(content::ExecuteScriptAndExtractBool(web_contents, is_fullscreen_script,
                                              &is_fullscreen));
+
   ASSERT_TRUE(is_fullscreen);
+  if (IsDialogClosed(web_contents))
+    OpenMRDialog(web_contents);
+  CloseRouteOnUI();
+  // Wait 15s for Chromecast to back to home screen and ready to use status.
+  Wait(base::TimeDelta::FromSeconds(15));
+}
+
+IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest, MANUAL_MirrorHTML5Video) {
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+
+  content::WebContents* dialog_contents = OpenMRDialog(web_contents);
+  ASSERT_TRUE(dialog_contents);
+
+  // Wait until the dialog finishes rendering.
+  WaitUntilDialogFullyLoaded(dialog_contents);
+  WaitUntilSinkDiscoveredOnUI();
+  ChooseSink(web_contents, receiver());
+
+  // Mirror tab for 10s.
+  Wait(base::TimeDelta::FromSeconds(10));
+  if (IsDialogClosed(web_contents))
+    dialog_contents = OpenMRDialog(web_contents);
+  WaitUntilDialogFullyLoaded(dialog_contents);
+
+  // Check the mirroring session has started successfully.
+  ASSERT_TRUE(!GetRouteId(receiver()).empty());
+  OpenMediaPage();
+
+  // Play the video on loop and wait 5s for it to play smoothly.
+  std::string script = "document.getElementsByTagName('video')[0].loop=true;";
+  ExecuteScript(web_contents, script);
+  Wait(base::TimeDelta::FromSeconds(5));
+
+  // Go to full screen and wait 5s for it to play smoothly.
+  script =
+      "document.getElementsByTagName('video')[0]."
+      "webkitRequestFullScreen();";
+  ExecuteScript(web_contents, script);
+  Wait(base::TimeDelta::FromSeconds(5));
+  if (IsDialogClosed(web_contents))
+    dialog_contents = OpenMRDialog(web_contents);
+  WaitUntilDialogFullyLoaded(dialog_contents);
+
+  // Check the mirroring session is still live.
+  ASSERT_TRUE(!GetRouteId(receiver()).empty());
+  Wait(base::TimeDelta::FromSeconds(20));
+  if (IsDialogClosed(web_contents))
+    OpenMRDialog(web_contents);
+  CloseRouteOnUI();
 }
 
 }  // namespace media_router