From ead49409787daabf09f559287dd1c0cb53c30a46 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Wed, 25 Jul 2012 21:43:22 +0000 Subject: Always use chromium threads for IO in remoting host BUG=137140 Review URL: https://chromiumcodereview.appspot.com/10808094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148418 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/protocol/jingle_session_unittest.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'remoting/protocol/jingle_session_unittest.cc') diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc index c72da08..0942934 100644 --- a/remoting/protocol/jingle_session_unittest.cc +++ b/remoting/protocol/jingle_session_unittest.cc @@ -17,7 +17,6 @@ #include "remoting/protocol/fake_authenticator.h" #include "remoting/protocol/jingle_session_manager.h" #include "remoting/protocol/libjingle_transport_factory.h" -#include "remoting/jingle_glue/jingle_thread.h" #include "remoting/jingle_glue/fake_signal_strategy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -89,9 +88,7 @@ class MockStreamChannelCallback { class JingleSessionTest : public testing::Test { public: JingleSessionTest() { - talk_base::ThreadManager::Instance()->WrapCurrentThread(); - message_loop_.reset( - new JingleThreadMessageLoop(talk_base::Thread::Current())); + message_loop_.reset(new MessageLoopForIO()); } // Helper method that handles OnIncomingSession(). @@ -257,7 +254,7 @@ class JingleSessionTest : public testing::Test { .Times(AtLeast(1)); } - scoped_ptr message_loop_; + scoped_ptr message_loop_; scoped_ptr host_signal_strategy_; scoped_ptr client_signal_strategy_; -- cgit v1.1