Fixing the Remote Desktop Browser Test (Me2Me connection test) Failure

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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 569 matching lines @@
         base::TimeDelta::FromMilliseconds(500),
         base::Bind(&RemoteDesktopBrowserTest::IsHostListReady, this));
   EXPECT_TRUE(waiter.Wait());
 
   std::string host_id = ExecuteScriptAndExtractString(
       "remoting.hostList.getHostIdForName('" + host_name + "')");
 
   EXPECT_FALSE(host_id.empty());
   std::string element_id = "host_" + host_id;
 
+  // Wait for the hosts to be online. Try 3 times each spanning 20 seconds
+  // successively for 60 seconds.
   ConditionalTimeoutWaiter hostOnlineWaiter(
-      base::TimeDelta::FromSeconds(30), base::TimeDelta::FromSeconds(5),
+      base::TimeDelta::FromSeconds(60), base::TimeDelta::FromSeconds(20),
       base::Bind(&RemoteDesktopBrowserTest::IsHostOnline,
                  base::Unretained(this), host_id));
   EXPECT_TRUE(hostOnlineWaiter.Wait());
 
   ClickOnControl(element_id);
 
   // Enter the pin # passed in from the command line.
   EnterPin(me2me_pin(), remember_pin);
 
   WaitForConnection();
@@ skipping 211 matching lines @@
       base::Bind(&RemoteDesktopBrowserTest::IsSessionConnected, this));
   EXPECT_TRUE(waiter.Wait());
 
   // The client is not yet ready to take input when the session state becomes
   // CONNECTED. Wait for 2 seconds for the client to become ready.
   // TODO(weitaosu): Find a way to detect when the client is truly ready.
   TimeoutWaiter(base::TimeDelta::FromSeconds(2)).Wait();
 }
 
 bool RemoteDesktopBrowserTest::IsHostOnline(const std::string& host_id) {
-  bool refresh_host_list =
-      ExecuteScriptAndExtractBool("remoting.hostList.refreshAndDisplay()");
 
-  if (!refresh_host_list) {
-    return false;
-  }
+  ExecuteScript("remoting.hostList.refreshAndDisplay()");
 
-  // Verify the host is online.
+ // Verify the host is online.
   std::string element_id = "host_" + host_id;
   std::string host_div_class = ExecuteScriptAndExtractString(
       "document.getElementById('" + element_id + "').parentNode.className");
 
   return (std::string::npos != host_div_class.find("host-online"));
 }
 
 bool RemoteDesktopBrowserTest::IsLocalHostReady() {
   // TODO(weitaosu): Instead of polling, can we register a callback to
   // remoting.hostList.setLocalHost_?
@@ skipping 100 matching lines @@
 
   ConditionalTimeoutWaiter homeWaiter(
           base::TimeDelta::FromSeconds(5),
           base::TimeDelta::FromMilliseconds(500),
           base::Bind(&RemoteDesktopBrowserTest::IsAppModeEqualTo,
                      this, "remoting.AppMode.HOME"));
   EXPECT_TRUE(homeWaiter.Wait());
 }
 
 }  // namespace remoting