summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 21:12:59 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 21:12:59 +0000
commitfd5633b12e0ed15c62e6e0001b52bd53b895299c (patch)
treebe829493b515c9059962d1f8f646b0a0c8681a14 /remoting/protocol
parent8909be9febb02000f0b600b3bf0b85db92377a4a (diff)
downloadchromium_src-fd5633b12e0ed15c62e6e0001b52bd53b895299c.zip
chromium_src-fd5633b12e0ed15c62e6e0001b52bd53b895299c.tar.gz
chromium_src-fd5633b12e0ed15c62e6e0001b52bd53b895299c.tar.bz2
Revert 100589 - Access Session::config() on the correct thread.
BUG=88600 TEST=Unittests Review URL: http://codereview.chromium.org/7867019 TBR=sergeyu@chromium.org Review URL: http://codereview.chromium.org/7880002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/jingle_session.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index b30101c..b80239c 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -165,7 +165,10 @@ net::Socket* JingleSession::event_channel() {
}
const std::string& JingleSession::jid() {
- DCHECK(CalledOnValidThread());
+ // 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());
return jid_;
}
@@ -189,7 +192,10 @@ const std::string& JingleSession::local_certificate() const {
}
const SessionConfig& JingleSession::config() {
- DCHECK(CalledOnValidThread());
+ // 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(config_set_);
return config_;
}