Updating the Chromoting Test Driver to target the test environment

remoting/client/chromoting_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/chromoting_client.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "remoting/base/capabilities.h"
@@ skipping 47 matching lines @@
     const protocol::ClientAuthenticationConfig& client_auth_config,
     scoped_refptr<protocol::TransportContext> transport_context,
     const std::string& host_jid,
     const std::string& capabilities) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!session_manager_);  // Start must be called more than once.
 
   host_jid_ = NormalizeJid(host_jid);
   local_capabilities_ = capabilities;
 
-  if (!protocol_config_)
+  if (!protocol_config_) {
     protocol_config_ = protocol::CandidateSessionConfig::CreateDefault();
-  if (!audio_consumer_)
-    protocol_config_->DisableAudioChannel();
+  }
 
   if (!connection_) {
     if (protocol_config_->webrtc_supported()) {
       DCHECK(!protocol_config_->ice_supported());
 #if !defined(ENABLE_WEBRTC_REMOTING_CLIENT)
       LOG(FATAL) << "WebRTC is not supported.";
 #else
       connection_.reset(new protocol::WebrtcConnectionToHost());
 #endif
     } else {
       DCHECK(protocol_config_->ice_supported());
       connection_.reset(new protocol::IceConnectionToHost());
     }
   }
   connection_->set_client_stub(this);
   connection_->set_clipboard_stub(this);
   connection_->set_video_renderer(video_renderer_);
 
-  connection_->InitializeAudio(audio_decode_task_runner_, audio_consumer_);
+  if (audio_consumer_) {
+    connection_->InitializeAudio(audio_decode_task_runner_, audio_consumer_);
+  } else {
+    protocol_config_->DisableAudioChannel();
+  }
 
   session_manager_.reset(new protocol::JingleSessionManager(signal_strategy));
   session_manager_->set_protocol_config(std::move(protocol_config_));
 
   client_auth_config_ = client_auth_config;
   transport_context_ = transport_context;
 
   signal_strategy_ = signal_strategy;
   signal_strategy_->AddListener(this);
 
@@ skipping 155 matching lines @@
   VLOG(1) << "Client capabilities: " << local_capabilities_;
 
   protocol::Capabilities capabilities;
   capabilities.set_capabilities(local_capabilities_);
   connection_->host_stub()->SetCapabilities(capabilities);
 
   mouse_input_scaler_.set_input_stub(connection_->input_stub());
 }
 
 }  // namespace remoting