summaryrefslogtreecommitdiffstats
path: root/jingle/glue/thread_wrapper_unittest.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-14 11:02:54 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-14 11:02:54 +0000
commit4b71a721b49c24e52930de0a1b8665edf7d4d99f (patch)
treed0bb87b5892beb52da0633fd5542c82a3feda9db /jingle/glue/thread_wrapper_unittest.cc
parent2a8d287cd8c5f74c596980e6e76c1d5f140012d2 (diff)
downloadchromium_src-4b71a721b49c24e52930de0a1b8665edf7d4d99f.zip
chromium_src-4b71a721b49c24e52930de0a1b8665edf7d4d99f.tar.gz
chromium_src-4b71a721b49c24e52930de0a1b8665edf7d4d99f.tar.bz2
Update JingleThreadWrapper to allow it to be created using task runner.
Previously JingleThreadWrapper required a MessageLoop. In NaCl we don't have MessageLoop for the main plugin thread, but have a task runner. This CL allows to use JingleThreadWrapper on the main NaCl thread. BUG=134216 TBR=tommi@chromium.org Review URL: https://chromiumcodereview.appspot.com/10823224 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue/thread_wrapper_unittest.cc')
-rw-r--r--jingle/glue/thread_wrapper_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc
index 41df41c..31f1285 100644
--- a/jingle/glue/thread_wrapper_unittest.cc
+++ b/jingle/glue/thread_wrapper_unittest.cc
@@ -81,7 +81,7 @@ class ThreadWrapperTest : public testing::Test {
}
virtual void SetUp() OVERRIDE {
- JingleThreadWrapper::EnsureForCurrentThread();
+ JingleThreadWrapper::EnsureForCurrentMessageLoop();
thread_ = talk_base::Thread::Current();
}
@@ -230,7 +230,7 @@ TEST_F(ThreadWrapperTest, SendSameThread) {
void InitializeWrapperForNewThread(talk_base::Thread** thread,
base::WaitableEvent* done_event) {
- JingleThreadWrapper::EnsureForCurrentThread();
+ JingleThreadWrapper::EnsureForCurrentMessageLoop();
JingleThreadWrapper::current()->set_send_allowed(true);
*thread = JingleThreadWrapper::current();
done_event->Signal();