summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/protocol_test_client.cc
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 15:56:57 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 15:56:57 +0000
commite05eb1d621ca0a26e0b33c650d4dbf456dba6863 (patch)
tree97322432de7e2381eb065cc3af19d53abba6e2f3 /remoting/protocol/protocol_test_client.cc
parentfbc94a82c898c17dffbb7bad4f2ed70ffc15b133 (diff)
downloadchromium_src-e05eb1d621ca0a26e0b33c650d4dbf456dba6863.zip
chromium_src-e05eb1d621ca0a26e0b33c650d4dbf456dba6863.tar.gz
chromium_src-e05eb1d621ca0a26e0b33c650d4dbf456dba6863.tar.bz2
Refactor JingleClient to support thunking the xmpp signaling into Javascript.
We do this so that we may make HTTP requests using the javascript libraries available to Google Talk. This is required to allow us to sandbox. BUG=none TEST=none Review URL: http://codereview.chromium.org/6597092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/protocol_test_client.cc')
-rw-r--r--remoting/protocol/protocol_test_client.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/remoting/protocol/protocol_test_client.cc b/remoting/protocol/protocol_test_client.cc
index 849bbd7..f95b93e 100644
--- a/remoting/protocol/protocol_test_client.cc
+++ b/remoting/protocol/protocol_test_client.cc
@@ -112,6 +112,7 @@ class ProtocolTestClient
void DestroyConnection(scoped_refptr<ProtocolTestConnection> connection);
std::string host_jid_;
+ scoped_ptr<SignalStrategy> signal_strategy_;
scoped_refptr<JingleClient> client_;
scoped_refptr<JingleSessionManager> session_manager_;
ConnectionsList connections_;
@@ -225,8 +226,11 @@ void ProtocolTestClient::Run(const std::string& username,
const std::string& host_jid) {
remoting::JingleThread jingle_thread;
jingle_thread.Start();
- client_ = new JingleClient(&jingle_thread);
- client_->Init(username, auth_token, kChromotingTokenServiceName, this);
+ signal_strategy_.reset(
+ new XmppSignalStrategy(&jingle_thread, username, auth_token,
+ kChromotingTokenServiceName));
+ client_ = new JingleClient(&jingle_thread, signal_strategy_.get(), this);
+ client_->Init();
session_manager_ = new JingleSessionManager(&jingle_thread);