Integrate P2P Sockets IPC with chromoting plugin.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/6624020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76964 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 5 deletions

diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 27d2da1..3d34997 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -21,8 +21,13 @@
 namespace remoting {
 namespace protocol {
 
-ConnectionToHost::ConnectionToHost(JingleThread* thread)
+ConnectionToHost::ConnectionToHost(
+    JingleThread* thread,
+    talk_base::NetworkManager* network_manager,
+    talk_base::PacketSocketFactory* socket_factory)
     : thread_(thread),
+      network_manager_(network_manager),
+      socket_factory_(socket_factory),
       event_callback_(NULL),
       dispatcher_(new ClientMessageDispatcher()) {
 }
@@ -61,7 +66,9 @@ void ConnectionToHost::Connect(const std::string& username,
                                kChromotingTokenServiceName));
   }
 
-  jingle_client_ = new JingleClient(thread_, signal_strategy_.get(), this);
+  jingle_client_ = new JingleClient(thread_, signal_strategy_.get(),
+                                    network_manager_.release(),
+                                    socket_factory_.release(), this);
   jingle_client_->Init();
 
   // Save jid of the host. The actual connection is created later after
@@ -72,8 +79,7 @@ void ConnectionToHost::Connect(const std::string& username,
 void ConnectionToHost::Disconnect() {
   if (MessageLoop::current() != message_loop()) {
     message_loop()->PostTask(
-        FROM_HERE, NewRunnableMethod(this,
-                                     &ConnectionToHost::Disconnect));
+        FROM_HERE, NewRunnableMethod(this, &ConnectionToHost::Disconnect));
     return;
   }
 
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index 0869a7b..2f661ca 100644
--- a/remoting/protocol/connection_to_host.h
+++ b/remoting/protocol/connection_to_host.h
@@ -50,8 +50,13 @@ class ConnectionToHost : public JingleClient::Callback {
     virtual void OnConnectionFailed(ConnectionToHost* conn) = 0;
   };
 
+  // Takes ownership of |network_manager| and |socket_factory|. Both
+  // |network_manager| and |socket_factory| may be set to NULL.
+  //
   // TODO(sergeyu): Constructor shouldn't need thread here.
-  explicit ConnectionToHost(JingleThread* thread);
+  ConnectionToHost(JingleThread* thread,
+                   talk_base::NetworkManager* network_manager,
+                   talk_base::PacketSocketFactory* socket_factory);
   virtual ~ConnectionToHost();
 
   // TODO(ajwong): We need to generalize this API.
@@ -98,6 +103,9 @@ class ConnectionToHost : public JingleClient::Callback {
 
   JingleThread* thread_;
 
+  scoped_ptr<talk_base::NetworkManager> network_manager_;
+  scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
+
   scoped_ptr<SignalStrategy> signal_strategy_;
   scoped_refptr<JingleClient> jingle_client_;
   scoped_refptr<SessionManager> session_manager_;