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

Side by Side Diff: remoting/client/chromoting_client.cc

Issue 2542343004: Updating the Chromoting Test Driver to target the test environment (Closed)
Patch Set: Fixed a swapped test/prod condition Created 4 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "remoting/client/chromoting_client.h" 5 #include "remoting/client/chromoting_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "remoting/base/capabilities.h" 10 #include "remoting/base/capabilities.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #endif 80 #endif
81 } else { 81 } else {
82 DCHECK(protocol_config_->ice_supported()); 82 DCHECK(protocol_config_->ice_supported());
83 connection_.reset(new protocol::IceConnectionToHost()); 83 connection_.reset(new protocol::IceConnectionToHost());
84 } 84 }
85 } 85 }
86 connection_->set_client_stub(this); 86 connection_->set_client_stub(this);
87 connection_->set_clipboard_stub(this); 87 connection_->set_clipboard_stub(this);
88 connection_->set_video_renderer(video_renderer_); 88 connection_->set_video_renderer(video_renderer_);
89 89
90 connection_->InitializeAudio(audio_decode_task_runner_, audio_consumer_); 90 if (audio_consumer_) {
Sergey Ulanov 2016/12/02 19:55:44 nit: Please move protocol_config_->DisableAudioCha
91 connection_->InitializeAudio(audio_decode_task_runner_, audio_consumer_);
92 }
91 93
92 session_manager_.reset(new protocol::JingleSessionManager(signal_strategy)); 94 session_manager_.reset(new protocol::JingleSessionManager(signal_strategy));
93 session_manager_->set_protocol_config(std::move(protocol_config_)); 95 session_manager_->set_protocol_config(std::move(protocol_config_));
94 96
95 client_auth_config_ = client_auth_config; 97 client_auth_config_ = client_auth_config;
96 transport_context_ = transport_context; 98 transport_context_ = transport_context;
97 99
98 signal_strategy_ = signal_strategy; 100 signal_strategy_ = signal_strategy;
99 signal_strategy_->AddListener(this); 101 signal_strategy_->AddListener(this);
100 102
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 VLOG(1) << "Client capabilities: " << local_capabilities_; 258 VLOG(1) << "Client capabilities: " << local_capabilities_;
257 259
258 protocol::Capabilities capabilities; 260 protocol::Capabilities capabilities;
259 capabilities.set_capabilities(local_capabilities_); 261 capabilities.set_capabilities(local_capabilities_);
260 connection_->host_stub()->SetCapabilities(capabilities); 262 connection_->host_stub()->SetCapabilities(capabilities);
261 263
262 mouse_input_scaler_.set_input_stub(connection_->input_stub()); 264 mouse_input_scaler_.set_input_stub(connection_->input_stub());
263 } 265 }
264 266
265 } // namespace remoting 267 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | remoting/test/access_token_fetcher.cc » ('j') | remoting/test/chromoting_test_driver_environment.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698