Index: remoting/protocol/libjingle_transport_factory.cc |
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc |
index f2d00a411f20bdd6cf205ef22aad6e8694a27ba2..3c5b5c81dc9e03d105741bae33be9f965bd860ce 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(); |
port_allocator_->set_flags( |
cricket::PORTALLOCATOR_DISABLE_TCP | |
cricket::PORTALLOCATOR_DISABLE_STUN | |