Access Session::config() on the correct thread.

BUG=88600
TEST=Unittests

Review URL: http://codereview.chromium.org/7867019

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

3 files changed, 22 insertions, 16 deletions

diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 8947a27..1b00087 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -447,12 +447,19 @@ void ChromotingHost::EnableCurtainMode(bool enable) {
 
 void ChromotingHost::LocalLoginSucceeded(
     scoped_refptr<ConnectionToClient> connection) {
-  if (MessageLoop::current() != context_->main_message_loop()) {
-    context_->main_message_loop()->PostTask(
-        FROM_HERE, base::Bind(&ChromotingHost::LocalLoginSucceeded, this,
-                              connection));
-    return;
-  }
+  DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
+
+  context_->main_message_loop()->PostTask(
+      FROM_HERE, base::Bind(&ChromotingHost::AddAuthenticatedClient,
+                            this, connection, connection->session()->config(),
+                            connection->session()->jid()));
+}
+
+void ChromotingHost::AddAuthenticatedClient(
+    scoped_refptr<ConnectionToClient> connection,
+    const protocol::SessionConfig& config,
+    const std::string& jid) {
+  DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
 
   protocol::LocalLoginStatus* status = new protocol::LocalLoginStatus();
   status->set_success(true);
@@ -477,7 +484,7 @@ void ChromotingHost::LocalLoginSucceeded(
   if (!recorder_.get()) {
     // Then we create a ScreenRecorder passing the message loops that
     // it should run on.
-    Encoder* encoder = CreateEncoder(connection->session()->config());
+    Encoder* encoder = CreateEncoder(config);
 
     recorder_ = new ScreenRecorder(context_->main_message_loop(),
                                    context_->encode_message_loop(),
@@ -498,7 +505,7 @@ void ChromotingHost::LocalLoginSucceeded(
   // including closing the connection on failure of a critical operation.
   EnableCurtainMode(true);
   if (is_it2me_) {
-    std::string username = connection->session()->jid();
+    std::string username = jid;
     size_t pos = username.find('/');
     if (pos != std::string::npos)
       username.replace(pos, std::string::npos, "");
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index 7b5cea5..3f34233 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -125,6 +125,11 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
       protocol::Session* session,
       protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE;
 
+  void AddAuthenticatedClient(
+      scoped_refptr<protocol::ConnectionToClient> connection,
+      const protocol::SessionConfig& config,
+      const std::string& jid);
+
   // Sets desired configuration for the protocol. Ownership of the
   // |config| is transferred to the object. Must be called before Start().
   void set_protocol_config(protocol::CandidateSessionConfig* config);
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index b80239c..b30101c 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -165,10 +165,7 @@ net::Socket* JingleSession::event_channel() {
 }
 
 const std::string& JingleSession::jid() {
-  // TODO(sergeyu): Fix ChromotingHost so that it doesn't call this
-  // method on invalid thread and uncomment this DCHECK.
-  // See crbug.com/88600 .
-  // DCHECK(CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
   return jid_;
 }
 
@@ -192,10 +189,7 @@ const std::string& JingleSession::local_certificate() const {
 }
 
 const SessionConfig& JingleSession::config() {
-  // TODO(sergeyu): Fix ChromotingHost so that it doesn't call this
-  // method on invalid thread and uncomment this DCHECK.
-  // See crbug.com/88600 .
-  // DCHECK(CalledOnValidThread());
+  DCHECK(CalledOnValidThread());
   DCHECK(config_set_);
   return config_;
 }