summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 01:01:20 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 01:01:20 +0000
commit85546bf0e8e7ccc43784997279ffe131628ec062 (patch)
treedb5ba42b0c8543529efa59d4bfc4b807ded018e2 /remoting
parentc0bac53df6ffdd2bf29a8ec561429dfdd9ff39f5 (diff)
downloadchromium_src-85546bf0e8e7ccc43784997279ffe131628ec062.zip
chromium_src-85546bf0e8e7ccc43784997279ffe131628ec062.tar.gz
chromium_src-85546bf0e8e7ccc43784997279ffe131628ec062.tar.bz2
Fix build break in remoting
chromoting_jingle_test_client needs to be updated due to changes in JingleClient TBR=ajwong Review URL: http://codereview.chromium.org/2730009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/jingle_glue/jingle_test_client.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/remoting/jingle_glue/jingle_test_client.cc b/remoting/jingle_glue/jingle_test_client.cc
index 7bf33c0..e8c1699 100644
--- a/remoting/jingle_glue/jingle_test_client.cc
+++ b/remoting/jingle_glue/jingle_test_client.cc
@@ -18,6 +18,7 @@ extern "C" {
#include "remoting/base/constants.h"
#include "remoting/jingle_glue/jingle_channel.h"
#include "remoting/jingle_glue/jingle_client.h"
+#include "remoting/jingle_glue/jingle_thread.h"
using remoting::JingleClient;
using remoting::JingleChannel;
@@ -55,7 +56,10 @@ class JingleTestClient : public JingleChannel::Callback,
void Run(const std::string& username, const std::string& auth_token,
const std::string& host_jid) {
- client_ = new JingleClient();
+ // TODO(hclam): Fix the threading problem.
+ remoting::JingleThread jingle_thread;
+ jingle_thread.Start();
+ client_ = new JingleClient(&jingle_thread);
client_->Init(username, auth_token, kChromotingTokenServiceName, this);
if (host_jid != "") {
@@ -89,6 +93,7 @@ class JingleTestClient : public JingleChannel::Callback,
}
client_->Close();
+ jingle_thread.Stop();
}
// JingleChannel::Callback interface.