Wire up the codepath from Javascript into Jingle for IQ packets.

Flushes out XmppProxy, the thread-safe interface that matches up Pepper with Jingle and plumbs a ConnectSandboxed method through everything so that the connection type can be chosen at runtime.

BUG=51198
TEST=Check that stanzas are sent/received from JS, and that xmpp still works.

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

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

2 files changed, 32 insertions, 10 deletions

diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 2ef3a22..cf65520 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -59,17 +59,32 @@ void ConnectionToHost::Connect(const std::string& username,
   video_stub_ = video_stub;
 
   // Initialize |jingle_client_|.
-  if (1 == 0) {
-    signal_strategy_.reset(new JavascriptSignalStrategy());
-  } else {
-    signal_strategy_.reset(
-        new XmppSignalStrategy(thread_, username, auth_token,
-                               kChromotingTokenServiceName));
-  }
+  signal_strategy_.reset(
+      new XmppSignalStrategy(thread_, username, auth_token,
+                             kChromotingTokenServiceName));
+  jingle_client_ = new JingleClient(thread_, signal_strategy_.get(), this);
+  jingle_client_->Init();
 
-  jingle_client_ = new JingleClient(thread_, signal_strategy_.get(),
-                                    network_manager_.release(),
-                                    socket_factory_.release(), this);
+  // Save jid of the host. The actual connection is created later after
+  // |jingle_client_| is connected.
+  host_jid_ = host_jid;
+}
+
+void ConnectionToHost::ConnectSandboxed(scoped_refptr<XmppProxy> xmpp_proxy,
+                                        const std::string& your_jid,
+                                        const std::string& host_jid,
+                                        HostEventCallback* event_callback,
+                                        ClientStub* client_stub,
+                                        VideoStub* video_stub) {
+  event_callback_ = event_callback;
+  client_stub_ = client_stub;
+  video_stub_ = video_stub;
+
+  // Initialize |jingle_client_|.
+  JavascriptSignalStrategy* strategy = new JavascriptSignalStrategy(your_jid);
+  strategy->AttachXmppProxy(xmpp_proxy);
+  signal_strategy_.reset(strategy);
+  jingle_client_ = new JingleClient(thread_, signal_strategy_.get(), this);
   jingle_client_->Init();
 
   // Save jid of the host. The actual connection is created later after
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index 3962c32..da91be9 100644
--- a/remoting/protocol/connection_to_host.h
+++ b/remoting/protocol/connection_to_host.h
@@ -24,6 +24,7 @@ class MessageLoop;
 namespace remoting {
 
 class JingleThread;
+class XmppProxy;
 class VideoPacket;
 
 namespace protocol {
@@ -66,6 +67,12 @@ class ConnectionToHost : public JingleClient::Callback {
                        HostEventCallback* event_callback,
                        ClientStub* client_stub,
                        VideoStub* video_stub);
+  virtual void ConnectSandboxed(scoped_refptr<XmppProxy> xmpp_proxy,
+                                const std::string& your_jid,
+                                const std::string& host_jid,
+                                HostEventCallback* event_callback,
+                                ClientStub* client_stub,
+                                VideoStub* video_stub);
   virtual void Disconnect();
 
   virtual const SessionConfig* config();