Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4482)

Unified Diff: chrome/test/media_router/media_router_e2e_ui_browsertest.cc

Issue 2653493007: Change the flow for UI mirroring tests to start mirroing first then play the video. Replace WaitUnt… (Closed)
Patch Set: Change the flow for UI mirroring tests to start mirroing first then play the video. Replace WaitUnt… Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/media_router/media_router_e2e_ui_browsertest.cc
diff --git a/chrome/test/media_router/media_router_e2e_ui_browsertest.cc b/chrome/test/media_router/media_router_e2e_ui_browsertest.cc
index b689266a361777faef61dddd67f63670762dc48c..2d4a1dfcfcf579434023966ec93123993ea11d77 100644
--- a/chrome/test/media_router/media_router_e2e_ui_browsertest.cc
+++ b/chrome/test/media_router/media_router_e2e_ui_browsertest.cc
@@ -11,35 +11,38 @@
namespace media_router {
IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest, MANUAL_MirrorHTML5Video) {
- OpenMediaPage();
content::WebContents* web_contents =
- browser()->tab_strip_model()->GetActiveWebContents();
+ browser()->tab_strip_model()->GetActiveWebContents();
- // Play the video on loop.
- std::string script = "document.getElementsByTagName('video')[0].loop=true;";
- ExecuteScript(web_contents, script);
- // Wait for 5s to the video is playing smoothly.
- Wait(base::TimeDelta::FromSeconds(5));
content::WebContents* dialog_contents = OpenMRDialog(web_contents);
- // Wait for 10s to make sure the dialog finishes rendering.
- Wait(base::TimeDelta::FromSeconds(10));
ASSERT_TRUE(dialog_contents);
+
+ // Wait util the dialog finishes rendering.
+ WaitUntilDialogFullyLoaded(dialog_contents);
WaitUntilSinkDiscoveredOnUI();
ChooseSink(web_contents, receiver());
- WaitUntilRouteCreated();
// 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();
- // Go to full screen.
+ // 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 for 5s to the video is playing smoothly in full screen.
- Wait(base::TimeDelta::FromSeconds(5));
- OpenMRDialog(web_contents);
- // Wait for 5s to make sure the dialog finishes rendering.
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());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698