diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 21:01:12 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 21:01:12 +0000 |
| commit | 56955a78a086fd1fbd186533bc6ece22a77ca003 (patch) | |
| tree | f17d94ac50194b72231d3d69bb0570bd5f694638 /remoting/protocol/jingle_session_unittest.cc | |
| parent | 6df1360b590117ee806a8e1cedaa133697d67b2e (diff) | |
| download | chromium_src-56955a78a086fd1fbd186533bc6ece22a77ca003.zip chromium_src-56955a78a086fd1fbd186533bc6ece22a77ca003.tar.gz chromium_src-56955a78a086fd1fbd186533bc6ece22a77ca003.tar.bz2 | |
Always use chromium threads for IO in remoting host
BUG=137140
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148418
Review URL: https://chromiumcodereview.appspot.com/10808094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_session_unittest.cc')
| -rw-r--r-- | remoting/protocol/jingle_session_unittest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
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<JingleThreadMessageLoop> message_loop_; + scoped_ptr<MessageLoopForIO> message_loop_; scoped_ptr<FakeSignalStrategy> host_signal_strategy_; scoped_ptr<FakeSignalStrategy> client_signal_strategy_; |