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(

[kelvinp, 2014/07/19 01:18:58]

After the CL, we no longer assumes that the host is up and running before
expandme2me.  Instead, we expand me2me first and then start the host if it is
not online.

[Jamie, 2014/07/22 18:47:11]

Acknowledged.

-      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());

[kelvinp, 2014/07/19 01:18:58]

This assert fails as after a PIN setup.  The URL is appended with a hash.  I
don't see why this check is necessary so I removed it.

[Jamie, 2014/07/22 18:47:11]

Acknowledged.

   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 101 matching lines @@
   // tab not in our strip" error for the v1 app.
   ASSERT_TRUE(TimeoutWaiter(base::TimeDelta::FromSeconds(2)).Wait());
 }
 
 void RemoteDesktopBrowserTest::SetUpTestForMe2Me() {
   VerifyInternetAccess();
   Install();
   LaunchChromotingApp();
   Auth();
   ExpandMe2Me();
   LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js"));

[weitao, 2014/07/21 18:53:45]

Ideally, loading the test script is a setup step and should be done before any
test is run. But I also realize it probably cannot be loaded before the
chromoting app is launched. So maybe we should make it part of launching the app
(loading the script right after launching the app). 

[kelvinp, 2014/07/23 22:22:26]

Done.

+  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.
+  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();

[Jamie, 2014/07/22 18:47:11]

Unless the PIN is likely to be a reason for failure, I don't think it's worth
logging it here--it's just extra log noise.

[kelvinp, 2014/07/23 22:22:26]

The EXPECT_TRUE will ONLY log when the setup fails.  I think it is beneficial to
have logs to help debugging test failure. 

+}
+
 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