Access Session::config() and Session::jid() on the correct thread only.

remoting/protocol/jingle_session.cc

 // Copyright (c) 2011 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 "remoting/protocol/jingle_session.h"
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
@@ skipping 147 matching lines @@
   DCHECK(CalledOnValidThread());
   return control_channel_socket_.get();
 }
 
 net::Socket* JingleSession::event_channel() {
   DCHECK(CalledOnValidThread());
   return event_channel_socket_.get();
 }
 
 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_;
 }
 
 const CandidateSessionConfig* JingleSession::candidate_config() {
   DCHECK(CalledOnValidThread());
   DCHECK(candidate_config_.get());
   return candidate_config_.get();
 }
 
 void JingleSession::set_candidate_config(
     const CandidateSessionConfig* candidate_config) {
   DCHECK(CalledOnValidThread());
   DCHECK(!candidate_config_.get());
   DCHECK(candidate_config);
   candidate_config_.reset(candidate_config);
 }
 
 const std::string& JingleSession::local_certificate() const {
   DCHECK(CalledOnValidThread());
   return local_cert_;
 }
 
 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_;
 }
 
 void JingleSession::set_config(const SessionConfig& config) {
   DCHECK(CalledOnValidThread());
   DCHECK(!config_set_);
   config_ = config;
   config_set_ = true;
 }
@@ skipping 263 matching lines @@
     DCHECK_NE(state_, FAILED);
 
     state_ = new_state;
     if (state_change_callback_.get())
       state_change_callback_->Run(new_state);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting