HostTableEntry refactor

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/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
@@ skipping 539 matching lines @@
 void RemoteDesktopBrowserTest::ConnectToLocalHost(bool remember_pin) {
   // Wait for local-host to be ready.
   ConditionalTimeoutWaiter waiter(
         base::TimeDelta::FromSeconds(5),
         base::TimeDelta::FromMilliseconds(500),
         base::Bind(&RemoteDesktopBrowserTest::IsLocalHostReady, this));
   EXPECT_TRUE(waiter.Wait());
 
   // 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'"));
+      "remoting.hostList.localHostSection_.host_.hostName && "
+      "remoting.hostList.localHostSection_.host_.hostId && "
+      "remoting.hostList.localHostSection_.host_.status && "
+      "remoting.hostList.localHostSection_.host_.status == 'ONLINE'"));
 
   // Connect.
-  ClickOnControl("this-host-connect");
+  ClickOnControl("local-host-connect-button");
 
   // Enter the pin # passed in from the command line.
   EnterPin(me2me_pin(), remember_pin);
 
   WaitForConnection();
 }
 
 void RemoteDesktopBrowserTest::ConnectToRemoteHost(
     const std::string& host_name, bool remember_pin) {
 
@@ skipping 239 matching lines @@
 
   // 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::IsLocalHostReady() {
   // TODO(weitaosu): Instead of polling, can we register a callback to
   // remoting.hostList.setLocalHost_?
-  return ExecuteScriptAndExtractBool("remoting.hostList.localHost_ != null");
+  return ExecuteScriptAndExtractBool(
+      "remoting.hostList.localHostSection_.host_ != null");
 }
 
 bool RemoteDesktopBrowserTest::IsHostListReady() {
   // Wait until hostList is not null.
   // The connect-to-host tests are run on the waterfall using a new profile-dir.
   // No hosts will be cached.
   return ExecuteScriptAndExtractBool(
     "remoting.hostList != null && remoting.hostList.hosts_ != null");
 }
 
@@ skipping 90 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