Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: remoting/protocol/jingle_session_manager.cc

Issue 8495024: Access ChromotingHost::clients_ only on network thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/connection_to_client_unittest.cc ('k') | remoting/protocol/session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_manager.cc
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index cf85d0f5b4b25b94dd46173c51370bbc556f8471..e1a935daaf485c01bb6e743ee449699705000d5f 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -38,6 +38,8 @@ JingleSessionManager::JingleSessionManager(
}
JingleSessionManager::~JingleSessionManager() {
+ // Session manager can be destroyed only after all sessions are destroyed.
+ DCHECK(sessions_.empty());
Close();
}
@@ -111,13 +113,9 @@ void JingleSessionManager::Init(
void JingleSessionManager::Close() {
DCHECK(CalledOnValidThread());
- // Close() can be called only after all sessions are destroyed.
- DCHECK(sessions_.empty());
-
if (!closed_) {
cricket_session_manager_->RemoveClient(kChromotingXmlNamespace);
jingle_signaling_connector_.reset();
- cricket_session_manager_.reset();
closed_ = true;
}
}
« no previous file with comments | « remoting/protocol/connection_to_client_unittest.cc ('k') | remoting/protocol/session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698