Make AudioPlayer optional in ChromotingClient

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 "base/bind.h"
 #include "remoting/base/capabilities.h"
 #include "remoting/client/audio_decode_scheduler.h"
 #include "remoting/client/audio_player.h"
@@ skipping 23 matching lines @@
     : config_(config),
       task_runner_(client_context->main_task_runner()),
       connection_(connection),
       user_interface_(user_interface),
       host_capabilities_received_(false),
       weak_factory_(this) {
   rectangle_decoder_ =
       new RectangleUpdateDecoder(client_context->main_task_runner(),
                                  client_context->decode_task_runner(),
                                  frame_consumer);
-  audio_decode_scheduler_.reset(new AudioDecodeScheduler(
-      client_context->main_task_runner(),
-      client_context->audio_decode_task_runner(),
-      audio_player.Pass()));
+  if (audio_player.get())

[Wez, 2013/07/09 20:08:07]

nit: if (audio_player)

[Wez, 2013/07/09 20:08:07]

This if has a multi-line statement, so use {}

[solb, 2013/07/10 00:00:31]

Done.

[solb, 2013/07/10 00:00:31]

Done.

+    audio_decode_scheduler_.reset(new AudioDecodeScheduler(
+        client_context->main_task_runner(),
+        client_context->audio_decode_task_runner(),
+        audio_player.Pass()));
+  // Otherwise, it will be left as a null pointer.

[Wez, 2013/07/09 20:08:07]

What does this comment mean?

[solb, 2013/07/10 00:00:31]

Done.

 }
 
 ChromotingClient::~ChromotingClient() {
 }
 
 void ChromotingClient::Start(
     SignalStrategy* signal_strategy,
     scoped_ptr<protocol::TransportFactory> transport_factory) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
@@ skipping 117 matching lines @@
   if (connection_->config().SupportsCapabilities()) {
     VLOG(1) << "Client capabilities: " << config_.capabilities;
 
     protocol::Capabilities capabilities;
     capabilities.set_capabilities(config_.capabilities);
     connection_->host_stub()->SetCapabilities(capabilities);
   }
 }
 
 }  // namespace remoting