Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1016)

Side by Side Diff: remoting/protocol/protocol_test_client.cc

Issue 7312013: Minor cleanups in JingleSession and JingleSessionManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if !defined(OS_WIN) 7 #if !defined(OS_WIN)
8 extern "C" { 8 extern "C" {
9 #include <unistd.h> 9 #include <unistd.h>
10 } 10 }
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 const std::string& auth_token, 213 const std::string& auth_token,
214 const std::string& auth_service, 214 const std::string& auth_service,
215 const std::string& host_jid) { 215 const std::string& host_jid) {
216 remoting::JingleThread jingle_thread; 216 remoting::JingleThread jingle_thread;
217 jingle_thread.Start(); 217 jingle_thread.Start();
218 218
219 signal_strategy_.reset( 219 signal_strategy_.reset(
220 new XmppSignalStrategy(&jingle_thread, username, auth_token, 220 new XmppSignalStrategy(&jingle_thread, username, auth_token,
221 auth_service)); 221 auth_service));
222 signal_strategy_->Init(this); 222 signal_strategy_->Init(this);
223 session_manager_.reset(new JingleSessionManager(NULL, NULL, NULL)); 223 session_manager_.reset(JingleSessionManager::CreateNotSandboxed());
224 224
225 host_jid_ = host_jid; 225 host_jid_ = host_jid;
226 226
227 while (true) { 227 while (true) {
228 std::string line; 228 std::string line;
229 std::getline(std::cin, line); 229 std::getline(std::cin, line);
230 230
231 { 231 {
232 base::AutoLock auto_lock(connections_lock_); 232 base::AutoLock auto_lock(connections_lock_);
233 233
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 std::string auth_service("oauth2"); 354 std::string auth_service("oauth2");
355 if (cmd_line->HasSwitch("auth_service")) 355 if (cmd_line->HasSwitch("auth_service"))
356 auth_service = cmd_line->GetSwitchValueASCII("auth_service"); 356 auth_service = cmd_line->GetSwitchValueASCII("auth_service");
357 357
358 scoped_refptr<ProtocolTestClient> client(new ProtocolTestClient()); 358 scoped_refptr<ProtocolTestClient> client(new ProtocolTestClient());
359 359
360 client->Run(username, auth_token, host_jid, auth_service); 360 client->Run(username, auth_token, host_jid, auth_service);
361 361
362 return 0; 362 return 0;
363 } 363 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698