summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 20:54:34 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 20:54:34 +0000
commitf30394e222a0df68576c8564ecb4e1a8b4bf0d20 (patch)
treeef18939645d617a438190a99f20014db798a5e99 /remoting
parentd4953c05673672adb8ae8a3baadfcc9c7848d7f6 (diff)
downloadchromium_src-f30394e222a0df68576c8564ecb4e1a8b4bf0d20.zip
chromium_src-f30394e222a0df68576c8564ecb4e1a8b4bf0d20.tar.gz
chromium_src-f30394e222a0df68576c8564ecb4e1a8b4bf0d20.tar.bz2
Fixed tsan warnings in remoting_unittests
BUG=53766,53837 TEST=remoting_unittests under tsan Review URL: http://codereview.chromium.org/3269005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/jingle_glue/jingle_thread.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/jingle_glue/jingle_thread.cc b/remoting/jingle_glue/jingle_thread.cc
index 0037066..f13477e 100644
--- a/remoting/jingle_glue/jingle_thread.cc
+++ b/remoting/jingle_glue/jingle_thread.cc
@@ -92,6 +92,9 @@ void JingleThread::Stop() {
// queue before exiting. Thread::Stop() would not do that.
Post(this, kStopMessageId);
stopped_event_.Wait();
+
+ // This will wait until the thread is actually finished.
+ Thread::Stop();
}
MessageLoop* JingleThread::message_loop() {