Adding an interface to allow extention of the audio player for CRD and iOS.

remoting/client/plugin/chromoting_instance.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/plugin/chromoting_instance.h"
 
 #include <nacl_io/nacl_io.h>
 #include <sys/mount.h>
 
 #include <string>
@@ skipping 640 matching lines @@
       base::Bind(&ChromotingInstance::UpdateUmaCustomHistogram,
                  weak_factory_.GetWeakPtr(), true),
       base::Bind(&ChromotingInstance::UpdateUmaCustomHistogram,
                  weak_factory_.GetWeakPtr(), false),
       base::Bind(&ChromotingInstance::UpdateUmaEnumHistogram,
                  weak_factory_.GetWeakPtr()));
 
   if (!plugin_view_.is_null())
     video_renderer_->OnViewChanged(plugin_view_);
 
-  client_.reset(
-      new ChromotingClient(&context_, this, video_renderer_.get(),
-                           base::WrapUnique(new PepperAudioPlayer(this))));
+  if (!audio_player_) {
+    audio_player_.reset(new PepperAudioPlayer(this));
+  }
+
+  client_.reset(new ChromotingClient(&context_, this, video_renderer_.get(),
+                                     audio_player_->GetWeakPtr()));
 
   // Setup the signal strategy.
   signal_strategy_.reset(new DelegatingSignalStrategy(
       local_jid, base::Bind(&ChromotingInstance::SendOutgoingIq,
                             weak_factory_.GetWeakPtr())));
 
   // Create TransportContext.
   scoped_refptr<protocol::TransportContext> transport_context(
       new protocol::TransportContext(
           signal_strategy_.get(),
@@ skipping 292 matching lines @@
 
 void ChromotingInstance::Disconnect() {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   VLOG(0) << "Disconnecting from host.";
 
   // Disconnect the input pipeline and teardown the connection.
   mouse_input_filter_.set_input_stub(nullptr);
   client_.reset();
   video_renderer_.reset();
+  audio_player_.reset();
   stats_update_timer_.Stop();
 }
 
 void ChromotingInstance::PostChromotingMessage(const std::string& method,
                                                const pp::VarDictionary& data) {
   pp::VarDictionary message;
   message.Set(pp::Var("method"), pp::Var(method));
   message.Set(pp::Var("data"), data);
   PostMessage(message);
 }
@@ skipping 65 matching lines @@
 
   // Unregister this instance for logging.
   g_logging_instance = 0;
 }
 
 // static
 bool ChromotingInstance::LogToUI(int severity, const char* file, int line,
                                  size_t message_start,
                                  const std::string& str) {
   PP_LogLevel log_level = PP_LOGLEVEL_ERROR;
-  switch(severity) {
+  switch (severity) {
     case logging::LOG_INFO:
       log_level = PP_LOGLEVEL_TIP;
       break;
     case logging::LOG_WARNING:
       log_level = PP_LOGLEVEL_WARNING;
       break;
     case logging::LOG_ERROR:
     case logging::LOG_FATAL:
       log_level = PP_LOGLEVEL_ERROR;
       break;
@@ skipping 46 matching lines @@
   if (is_custom_counts_histogram) {
     uma.HistogramCustomCounts(histogram_name, value, histogram_min,
                               histogram_max, histogram_buckets);
   } else {
     uma.HistogramCustomTimes(histogram_name, value, histogram_min,
                              histogram_max, histogram_buckets);
   }
 }
 
 }  // namespace remoting