Automate host start up in browser test

chrome/test/remoting/remote_desktop_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/remoting/remote_desktop_browsertest.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
@@ skipping 325 matching lines @@
   // The Me2Me host list should be hidden.
   ASSERT_FALSE(HtmlElementVisible("me2me-content"));
   // The Me2Me "Get Start" button should be visible.
   ASSERT_TRUE(HtmlElementVisible("get-started-me2me"));
 
   // Starting Me2Me.
   ExecuteScript("remoting.showMe2MeUiAndSave();");
 
   EXPECT_TRUE(HtmlElementVisible("me2me-content"));
   EXPECT_FALSE(HtmlElementVisible("me2me-first-run"));
-
-  // Wait until localHost is initialized. This can take a while.
-  ConditionalTimeoutWaiter waiter(
-      base::TimeDelta::FromSeconds(3),
-      base::TimeDelta::FromSeconds(1),
-      base::Bind(&RemoteDesktopBrowserTest::IsLocalHostReady, this));
-  EXPECT_TRUE(waiter.Wait());
-
-  EXPECT_TRUE(ExecuteScriptAndExtractBool(
-      "remoting.hostList.localHost_.hostName && "
-      "remoting.hostList.localHost_.hostId && "
-      "remoting.hostList.localHost_.status && "
-      "remoting.hostList.localHost_.status == 'ONLINE'"));
 }
 
 void RemoteDesktopBrowserTest::DisconnectMe2Me() {
   // The chromoting extension should be installed.
   ASSERT_TRUE(extension_);
 
-  // The active tab should have the chromoting app loaded.
-  ASSERT_EQ(Chromoting_Main_URL(), GetCurrentURL());
   ASSERT_TRUE(RemoteDesktopBrowserTest::IsSessionConnected());
 
   ClickOnControl("toolbar-stub");
 
   EXPECT_TRUE(HtmlElementVisible("session-toolbar"));
 
   ClickOnControl("toolbar-disconnect");
 
   EXPECT_TRUE(HtmlElementVisible("client-dialog"));
   EXPECT_TRUE(HtmlElementVisible("client-reconnect-button"));
@@ skipping 99 matching lines @@
   // why this is needed for the v1 app to work.
   // Without this timeout the test fail with a "CloseWebContents called for
   // tab not in our strip" error for the v1 app.
   ASSERT_TRUE(TimeoutWaiter(base::TimeDelta::FromSeconds(2)).Wait());
 }
 
 void RemoteDesktopBrowserTest::SetUpTestForMe2Me() {
   VerifyInternetAccess();
   Install();
   LaunchChromotingApp();
+  LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js"));
   Auth();
   ExpandMe2Me();
-  LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js"));
+  EnsureRemoteConnectionEnabled();
 }
 
 void RemoteDesktopBrowserTest::Auth() {
   Authorize();
   Authenticate();
   Approve();
 }
 
+void RemoteDesktopBrowserTest::EnsureRemoteConnectionEnabled() {
+  // browser_test.ensureRemoteConnectionEnabled is defined in
+  // browser_test.js, which must be loaded before calling this function.
+  // TODO(kelvinp): This function currently only works on linux when the user is
+  // already part of the chrome-remote-desktop group.  Extend this functionality
+  // to Mac (https://crbug.com/397576) and Windows (https://crbug.com/397575).
+  bool result;
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      app_web_content(),
+      "browserTest.ensureRemoteConnectionEnabled(" + me2me_pin() + ")",
+      &result));
+  EXPECT_TRUE(result) << "Cannot start the host with Pin:" << me2me_pin();
+}
+
 void RemoteDesktopBrowserTest::ConnectToLocalHost(bool remember_pin) {
   // Verify that the local host is online.
   ASSERT_TRUE(ExecuteScriptAndExtractBool(
       "remoting.hostList.localHost_.hostName && "
       "remoting.hostList.localHost_.hostId && "
       "remoting.hostList.localHost_.status && "
       "remoting.hostList.localHost_.status == 'ONLINE'"));
 
   // Connect.
   ClickOnControl("this-host-connect");
@@ skipping 288 matching lines @@
 // static
 bool RemoteDesktopBrowserTest::IsHostActionComplete(
     content::WebContents* client_web_content,
     std::string host_action_var) {
   return ExecuteScriptAndExtractBool(
       client_web_content,
       host_action_var);
 }
 
 }  // namespace remoting