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

3 files changed, 8 insertions, 8 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_;
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index ca441af..721b61f 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -8,12 +8,13 @@
 #include "base/thread_task_runner_handle.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/pseudotcp_adapter.h"
+#include "jingle/glue/thread_wrapper.h"
 #include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/transport_config.h"
-#include "third_party/libjingle/source/talk/base/basicpacketsocketfactory.h"
+#include "remoting/jingle_glue/chromium_socket_factory.h"
 #include "third_party/libjingle/source/talk/base/network.h"
 #include "third_party/libjingle/source/talk/p2p/base/constants.h"
 #include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
@@ -311,15 +312,17 @@ LibjingleTransportFactory::LibjingleTransportFactory(
     : http_port_allocator_(port_allocator.get()),
       port_allocator_(port_allocator.Pass()),
       incoming_only_(incoming_only) {
+  jingle_glue::JingleThreadWrapper::EnsureForCurrentThread();
 }
 
 LibjingleTransportFactory::LibjingleTransportFactory()
     : network_manager_(new talk_base::BasicNetworkManager()),
-      socket_factory_(new talk_base::BasicPacketSocketFactory()),
+      socket_factory_(new remoting::ChromiumPacketSocketFactory()),
       http_port_allocator_(NULL),
       port_allocator_(new cricket::BasicPortAllocator(
           network_manager_.get(), socket_factory_.get())),
       incoming_only_(false) {
+  jingle_glue::JingleThreadWrapper::EnsureForCurrentThread();
 }
 
 LibjingleTransportFactory::~LibjingleTransportFactory() {
diff --git a/remoting/protocol/libjingle_transport_factory.h b/remoting/protocol/libjingle_transport_factory.h
index 0cead6d..bb54bd4 100644
--- a/remoting/protocol/libjingle_transport_factory.h
+++ b/remoting/protocol/libjingle_transport_factory.h
@@ -30,7 +30,7 @@ class LibjingleTransportFactory : public TransportFactory {
       scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator,
       bool incoming_only);
 
-  // Creates BasicNetworkManager, BasicPacketSocketFactory and
+  // Creates BasicNetworkManager, ChromiumPacketSocketFactory and
   // BasicPortAllocator.
   LibjingleTransportFactory();