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

remoting/client/jni/chromoting_jni_instance.cc

 // Copyright 2013 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/jni/chromoting_jni_instance.h"
 
 #include <android/log.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 28 matching lines @@
 namespace {
 
 // TODO(solb) Move into location shared with client plugin.
 const char* const kXmppServer = "talk.google.com";
 const int kXmppPort = 5222;
 const bool kXmppUseTls = true;
 
 // Interval at which to log performance statistics, if enabled.
 const int kPerfStatsIntervalMs = 60000;
 
-}
+}  // namespace
 
 ChromotingJniInstance::ChromotingJniInstance(
     ChromotingJniRuntime* jni_runtime,
     base::WeakPtr<JniClient> jni_client,
     base::WeakPtr<JniDisplayHandler> display,
     base::WeakPtr<JniPairingSecretFetcher> secret_fetcher,
     const std::string& username,
     const std::string& auth_token,
     const std::string& host_jid,
     const std::string& host_id,
@@ skipping 333 matching lines @@
 
   client_context_.reset(new ClientContext(jni_runtime_->network_task_runner()));
   client_context_->Start();
 
   perf_tracker_.reset(new protocol::PerformanceTracker());
 
   view_.reset(new JniFrameConsumer(jni_runtime_, display_handler_));
   video_renderer_.reset(new SoftwareVideoRenderer(
       client_context_->decode_task_runner(), view_.get(), perf_tracker_.get()));
 
-  client_.reset(
-      new ChromotingClient(client_context_.get(), this, video_renderer_.get(),
-                           base::WrapUnique(new AudioPlayerAndroid())));
+  if (!audio_player_) {
+    audio_player_.reset(new AudioPlayerAndroid());
+  }
+
+  client_.reset(new ChromotingClient(client_context_.get(), this,
+                                     video_renderer_.get(),
+                                     audio_player_->GetWeakPtr()));
 
   signaling_.reset(
       new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(),
                              jni_runtime_->url_requester(), xmpp_config_));
 
   scoped_refptr<protocol::TransportContext> transport_context =
       new protocol::TransportContext(
           signaling_.get(),
           base::WrapUnique(new protocol::ChromiumPortAllocatorFactory()),
           base::WrapUnique(
@@ skipping 80 matching lines @@
   jni_runtime_->logger()->LogStatistics(perf_tracker_.get());
 
   jni_runtime_->network_task_runner()->PostDelayedTask(
       FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs));
 }
 
 void ChromotingJniInstance::ReleaseResources() {
   // |client_| must be torn down before |signaling_|.
   client_.reset();
+  audio_player_.reset();
   video_renderer_.reset();
   view_.reset();
   signaling_.reset();
   perf_tracker_.reset();
   client_context_.reset();
 
   weak_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace remoting