Index: chrome/test/remoting/me2me_browsertest.cc |
diff --git a/chrome/test/remoting/me2me_browsertest.cc b/chrome/test/remoting/me2me_browsertest.cc |
index a8bc82ba5d904bbd557c5344e18c952f0c95c8a7..a53d07166bc234f1b1998aea033d0ee25b1dc103 100644 |
--- a/chrome/test/remoting/me2me_browsertest.cc |
+++ b/chrome/test/remoting/me2me_browsertest.cc |
@@ -16,7 +16,6 @@ class Me2MeBrowserTest : public RemoteDesktopBrowserTest { |
void ConnectPinlessAndCleanupPairings(bool cleanup_all); |
bool IsPairingSpinnerHidden(); |
- bool WaitForFullscreenChange(bool expect_fullscreen); |
}; |
IN_PROC_BROWSER_TEST_F(Me2MeBrowserTest, |
@@ -67,42 +66,6 @@ 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. |
@@ -187,17 +150,4 @@ 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), |
- base::TimeDelta::FromMilliseconds(500), |
- base::Bind(&RemoteDesktopBrowserTest::IsHostActionComplete, |
- active_web_contents(), |
- javascript)); |
- return waiter.Wait(); |
-} |
- |
} // namespace remoting |