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

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

Issue 1619663004: [Media Router] Remove second dialog state check in Dialog_Basic integration test on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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_integration_ui_browsertest.cc
diff --git a/chrome/test/media_router/media_router_integration_ui_browsertest.cc b/chrome/test/media_router/media_router_integration_ui_browsertest.cc
index 9193327541d9dbc89421dc7868b4258f8a26430e..e60235b6b502a66f4905c46babf6f1a5b2421947 100644
--- a/chrome/test/media_router/media_router_integration_ui_browsertest.cc
+++ b/chrome/test/media_router/media_router_integration_ui_browsertest.cc
@@ -81,6 +81,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {
dialog_contents, sink_name_script);
ASSERT_EQ(kTestSinkName, sink_name);
+#if defined(OS_MACOSX) || defined(OS_WIN)
// Simulate moving the mouse off the dialog. Confirm that the dialog closes
// automatically after the route is closed.
// In tests, it sometimes takes too long to CloseRouteOnUI() to finish so
@@ -91,8 +92,11 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {
"window.document.getElementById('media-router-container').dispatchEvent("
"new Event('mouseleave')))");
ASSERT_TRUE(content::ExecuteScript(dialog_contents, mouse_leave_script));
+#endif
CloseRouteOnUI();
+#if defined(OS_MACOSX) || defined(OS_WIN)
WaitUntilDialogClosed(web_contents);
Lei Lei 2016/01/21 19:07:55 I think we should keep this for Linux, because the
apacible 2016/01/21 19:10:02 I removed this for Linux since it appears mouseent
+#endif
}
IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
« 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