[Webapp Refactor] Remove remoting.clientSession.

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 369 matching lines @@
   EXPECT_TRUE(HtmlElementVisible("me2me-content"));
   EXPECT_FALSE(HtmlElementVisible("me2me-first-run"));
 }
 
 void RemoteDesktopBrowserTest::DisconnectMe2Me() {
   // The chromoting extension should be installed.
   ASSERT_TRUE(extension_);
 
   ASSERT_TRUE(RemoteDesktopBrowserTest::IsSessionConnected());
 
-  ExecuteScript("remoting.app.disconnect();");
+  ExecuteScript("remoting.app.getActivity().stop();");
 
   EXPECT_TRUE(HtmlElementVisible("client-dialog"));
   EXPECT_TRUE(HtmlElementVisible("client-reconnect-button"));
   EXPECT_TRUE(HtmlElementVisible("client-finished-me2me-button"));
 
   ClickOnControl("client-finished-me2me-button");
 
   EXPECT_FALSE(HtmlElementVisible("client-dialog"));
 }
 
@@ skipping 433 matching lines @@
   return ExecuteScriptAndExtractBool(
     "remoting.hostList != null && remoting.hostList.hosts_ != null");
 }
 
 bool RemoteDesktopBrowserTest::IsSessionConnected() {
   // If some form of PINless authentication is enabled, the host version
   // warning may appear while waiting for the session to connect.
   DismissHostVersionWarningIfVisible();
 
   return ExecuteScriptAndExtractBool(
-      "remoting.clientSession != null && "
-      "remoting.clientSession.getState() == "
-      "remoting.ClientSession.State.CONNECTED");
+      "remoting.currentMode === remoting.AppMode.IN_SESSION");
 }
 
 bool RemoteDesktopBrowserTest::IsPinFormVisible() {
   DismissHostVersionWarningIfVisible();
   return HtmlElementVisible("pin-form");
 }
 
 void RemoteDesktopBrowserTest::DismissHostVersionWarningIfVisible() {
   if (HtmlElementVisible("host-needs-update-connect-button"))
     ClickOnControl("host-needs-update-connect-button");
@@ skipping 71 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