commit 68043e1e95eeb07d5cae7aca370b26518b0867d6
author Torne (Richard Coles) <torne@google.com> Thu Sep 26 13:24:57 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Thu Sep 26 13:24:57 2013 +0100
tree cc6a216bce6aa9319a216327b73a07f49200dab5
parent cede44592cfb9ec370925d10c2df733349a94a82

Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178

remoting/client/jni/chromoting_jni_instance.cc

diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc
index 28822f6..84d94d6 100644
--- a/remoting/client/jni/chromoting_jni_instance.cc
+++ b/remoting/client/jni/chromoting_jni_instance.cc
@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "jingle/glue/xmpp_client_socket_factory.h"
 #include "net/socket/client_socket_factory.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/jni/android_keymap.h"
@@ -256,11 +255,9 @@
 
   view_->set_frame_producer(client_->GetFrameProducer());
 
-  scoped_ptr<jingle_glue::ResolvingClientSocketFactory> socket_factory(
-      new jingle_glue::XmppClientSocketFactory(
-          net::ClientSocketFactory::GetDefaultFactory(), net::SSLConfig(),
-          jni_runtime_->url_requester(), false));
-  signaling_.reset(new XmppSignalStrategy(socket_factory.Pass(), xmpp_config_));
+  signaling_.reset(new XmppSignalStrategy(
+      net::ClientSocketFactory::GetDefaultFactory(),
+      jni_runtime_->url_requester(), xmpp_config_));
 
   network_settings_.reset(new NetworkSettings(
       NetworkSettings::NAT_TRAVERSAL_ENABLED));