Chromium Code Reviews| Index: chrome/test/remoting/me2me_browsertest.cc |
| diff --git a/chrome/test/remoting/me2me_browsertest.cc b/chrome/test/remoting/me2me_browsertest.cc |
| index 3d784ff2ecdee597a890a09424563924328c12f0..1e543504dbf4054a5fbe10474af5ad4528a40e33 100644 |
| --- a/chrome/test/remoting/me2me_browsertest.cc |
| +++ b/chrome/test/remoting/me2me_browsertest.cc |
| @@ -16,6 +16,7 @@ class Me2MeBrowserTest : public RemoteDesktopBrowserTest { |
| void ConnectPinlessAndCleanupPairings(bool cleanup_all); |
| bool IsPairingSpinnerHidden(); |
| + bool WaitForFullscreenChange(bool expect_fullscreen); |
| }; |
| IN_PROC_BROWSER_TEST_F(Me2MeBrowserTest, |
| @@ -78,6 +79,42 @@ IN_PROC_BROWSER_TEST_F(Me2MeBrowserTest, |
| Cleanup(); |
| } |
| +IN_PROC_BROWSER_TEST_F(Me2MeBrowserTest, MANUAL_Me2Me_Fullscreen) { |
| + VerifyInternetAccess(); |
| + Install(); |
| + LaunchChromotingApp(); |
| + |
| + // Authorize, Authenticate, and Approve. |
| + Auth(); |
| + ExpandMe2Me(); |
| + |
| + ConnectToLocalHost(false); |
| + |
| + // Verify that we're initially not full-screen. |
| + EXPECT_FALSE(ExecuteScriptAndExtractBool( |
| + "remoting.fullscreen.isActive()")); |
| + |
| + // Click the full-screen button and verify that it activates full-screen mode. |
| + ClickOnControl("toggle-full-screen"); |
| + EXPECT_TRUE(WaitForFullscreenChange(true)); |
| + |
| + // Click the full-screen button again and verify that it deactivates |
| + // full-screen mode. |
| + ClickOnControl("toggle-full-screen"); |
| + EXPECT_TRUE(WaitForFullscreenChange(false)); |
| + |
| + // Enter full-screen mode again, then disconnect and verify that full-screen |
| + // mode is deactivated upon disconnection. |
| + // TODO(jamiewalch): For the v2 app, activate full-screen mode indirectly by |
| + // maximizing the window for the second test. |
| + ClickOnControl("toggle-full-screen"); |
| + EXPECT_TRUE(WaitForFullscreenChange(true)); |
| + DisconnectMe2Me(); |
| + EXPECT_TRUE(WaitForFullscreenChange(false)); |
| + |
| + Cleanup(); |
| +} |
| + |
| void Me2MeBrowserTest::TestKeyboardInput() { |
| // We will assume here that the browser window is already open on the host |
| // and in focus. |
| @@ -162,4 +199,17 @@ bool Me2MeBrowserTest::IsPairingSpinnerHidden() { |
| return !HtmlElementVisible("paired-client-manager-dialog-working"); |
| } |
| +bool Me2MeBrowserTest::WaitForFullscreenChange(bool expect_fullscreen) { |
| + std::string javascript = expect_fullscreen ? |
| + "remoting.fullscreen.isActive()" : |
| + "!remoting.fullscreen.isActive()"; |
| + ConditionalTimeoutWaiter waiter( |
| + base::TimeDelta::FromSeconds(10), |
|
weitao
2014/07/21 17:23:27
Please fix the indentation.
|
| + base::TimeDelta::FromMilliseconds(500), |
| + base::Bind(&RemoteDesktopBrowserTest::IsHostActionComplete, |
| + active_web_contents(), |
| + javascript)); |
| + return waiter.Wait(); |
| +} |
| + |
| } // namespace remoting |