Commit 67979c2e authored by apacible's avatar apacible Committed by Commit bot

[Media Router] Remove second dialog state check in Dialog_Basic integration test on Linux.

BUG=577943

Review URL: https://codereview.chromium.org/1619663004

Cr-Commit-Position: refs/heads/master@{#370793}
parent 7e344082
...@@ -81,6 +81,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) { ...@@ -81,6 +81,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {
dialog_contents, sink_name_script); dialog_contents, sink_name_script);
ASSERT_EQ(kTestSinkName, sink_name); ASSERT_EQ(kTestSinkName, sink_name);
#if defined(OS_MACOSX) || defined(OS_WIN)
// Simulate moving the mouse off the dialog. Confirm that the dialog closes // Simulate moving the mouse off the dialog. Confirm that the dialog closes
// automatically after the route is closed. // automatically after the route is closed.
// In tests, it sometimes takes too long to CloseRouteOnUI() to finish so // 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) { ...@@ -91,8 +92,11 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {
"window.document.getElementById('media-router-container').dispatchEvent(" "window.document.getElementById('media-router-container').dispatchEvent("
"new Event('mouseleave')))"); "new Event('mouseleave')))");
ASSERT_TRUE(content::ExecuteScript(dialog_contents, mouse_leave_script)); ASSERT_TRUE(content::ExecuteScript(dialog_contents, mouse_leave_script));
#endif
CloseRouteOnUI(); CloseRouteOnUI();
#if defined(OS_MACOSX) || defined(OS_WIN)
WaitUntilDialogClosed(web_contents); WaitUntilDialogClosed(web_contents);
#endif
} }
IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment