Move it2me business logic out of the UI class

BUG=156257


Review URL: https://chromiumcodereview.appspot.com/11194069

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162914 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 17 deletions

diff --git a/remoting/host/it2me_host_user_interface.cc b/remoting/host/it2me_host_user_interface.cc
index 38e0624..3f0653b 100644
--- a/remoting/host/it2me_host_user_interface.cc
+++ b/remoting/host/it2me_host_user_interface.cc
@@ -44,19 +44,6 @@ void It2MeHostUserInterface::Init() {
   continue_window_ = ContinueWindow::Create();
 }
 
-void It2MeHostUserInterface::OnClientAuthenticated(const std::string& jid) {
-  if (!get_authenticated_jid().empty()) {
-    // If we already authenticated another client then one of the
-    // connections may be an attacker, so both are suspect and we have
-    // to reject the second connection and shutdown the host.
-    get_host()->RejectAuthenticatingClient();
-    network_task_runner()->PostTask(FROM_HERE, base::Bind(
-        &ChromotingHost::Shutdown, get_host(), base::Closure()));
-  } else {
-    HostUserInterface::OnClientAuthenticated(jid);
-  }
-}
-
 void It2MeHostUserInterface::ProcessOnClientAuthenticated(
     const std::string& username) {
   DCHECK(ui_task_runner()->BelongsToCurrentThread());
diff --git a/remoting/host/it2me_host_user_interface.h b/remoting/host/it2me_host_user_interface.h
index 28e3e22..7471aa0 100644
--- a/remoting/host/it2me_host_user_interface.h
+++ b/remoting/host/it2me_host_user_interface.h
@@ -32,10 +32,6 @@ class It2MeHostUserInterface : public HostUserInterface {
   // HostUserInterface overrides.
   virtual void Init() OVERRIDE;
 
-  // HostStatusObserver implementation.  These methods will be called from the
-  // network thread.
-  virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
-
  protected:
   virtual void ProcessOnClientAuthenticated(
       const std::string& username) OVERRIDE;
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 664d132..52d9196 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -447,6 +447,14 @@ void HostNPScriptObject::It2MeImpl::OnClientAuthenticated(
     // Ignore the new connection if we are disconnecting.
     return;
   }
+  if (state_ == kConnected) {
+    // If we already connected another client then one of the connections may be
+    // an attacker, so both are suspect and we have to reject the second
+    // connection and shutdown the host.
+    host_->RejectAuthenticatingClient();
+    Disconnect();
+    return;
+  }
 
   std::string client_username = jid;
   size_t pos = client_username.find('/');