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

Unified Diff: remoting/protocol/jingle_session_unittest.cc

Issue 10829040: Revert 148418 - Always use chromium threads for IO in remoting host (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months 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/jingle_glue/xmpp_socket_adapter.cc ('k') | remoting/protocol/libjingle_transport_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_unittest.cc
===================================================================
--- remoting/protocol/jingle_session_unittest.cc (revision 148577)
+++ remoting/protocol/jingle_session_unittest.cc (working copy)
@@ -17,6 +17,7 @@
#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"
@@ -88,7 +89,9 @@
class JingleSessionTest : public testing::Test {
public:
JingleSessionTest() {
- message_loop_.reset(new MessageLoopForIO());
+ talk_base::ThreadManager::Instance()->WrapCurrentThread();
+ message_loop_.reset(
+ new JingleThreadMessageLoop(talk_base::Thread::Current()));
}
// Helper method that handles OnIncomingSession().
@@ -254,7 +257,7 @@
.Times(AtLeast(1));
}
- scoped_ptr<MessageLoopForIO> message_loop_;
+ scoped_ptr<JingleThreadMessageLoop> message_loop_;
scoped_ptr<FakeSignalStrategy> host_signal_strategy_;
scoped_ptr<FakeSignalStrategy> client_signal_strategy_;
« no previous file with comments | « remoting/jingle_glue/xmpp_socket_adapter.cc ('k') | remoting/protocol/libjingle_transport_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698