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

remoting/client/chromoting_client.h

 // 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.
 
 // ChromotingClient is the controller for the Client implementation.
 
 #ifndef REMOTING_CLIENT_CHROMOTING_CLIENT_H_
 #define REMOTING_CLIENT_CHROMOTING_CLIENT_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "remoting/protocol/client_authentication_config.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/mouse_input_filter.h"
 #include "remoting/protocol/performance_tracker.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/video_stub.h"
 #include "remoting/signaling/signal_strategy.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace remoting {
 
 namespace protocol {
 class CandidateSessionConfig;
 class SessionManager;
 class TransportContext;
 class VideoRenderer;
 }  // namespace protocol
 
+class AudioConsumer;
 class AudioDecodeScheduler;
-class AudioPlayer;
 class ClientContext;
 class ClientUserInterface;
 class FrameConsumerProxy;
 
 class ChromotingClient : public SignalStrategy::Listener,
                          public protocol::ConnectionToHost::HostEventCallback,
                          public protocol::ClientStub {
  public:
   // |client_context|, |user_interface| and |video_renderer| must outlive the
-  // client. |audio_player| may be null, in which case audio will not be
+  // client. |audio_consumer| may be null, in which case audio will not be
   // requested.
   ChromotingClient(ClientContext* client_context,
                    ClientUserInterface* user_interface,
                    protocol::VideoRenderer* video_renderer,
-                   std::unique_ptr<AudioPlayer> audio_player);
+                   base::WeakPtr<AudioConsumer> audio_consumer);
 
   ~ChromotingClient() override;
 
   void set_protocol_config(
       std::unique_ptr<protocol::CandidateSessionConfig> config);
 
   // Used to set fake/mock objects for tests which use the ChromotingClient.
   void SetConnectionToHostForTests(
       std::unique_ptr<protocol::ConnectionToHost> connection_to_host);
 
@@ skipping 29 matching lines @@
   void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override;
 
   // ConnectionToHost::HostEventCallback implementation.
   void OnConnectionState(protocol::ConnectionToHost::State state,
                          protocol::ErrorCode error) override;
   void OnConnectionReady(bool ready) override;
   void OnRouteChanged(const std::string& channel_name,
                       const protocol::TransportRoute& route) override;
 
  private:
-   // SignalStrategy::StatusObserver interface.
+  // SignalStrategy::StatusObserver interface.
   void OnSignalStrategyStateChange(SignalStrategy::State state) override;
   bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override;
 
   // Starts connection once |signal_strategy_| is connected.
   void StartConnection();
 
   // Called when the connection is authenticated.
   void OnAuthenticated();
 
   // Called when all channels are connected.
@@ skipping 29 matching lines @@
 
   // Record the statistics of the connection.
   protocol::PerformanceTracker perf_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_CHROMOTING_CLIENT_H_