Remove dependency on AudioStub in ConnectionToClient

remoting/host/client_session.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.
 
 #ifndef REMOTING_HOST_CLIENT_SESSION_H_
 #define REMOTING_HOST_CLIENT_SESSION_H_
 
 #include <cstdint>
 #include <memory>
 #include <string>
@@ skipping 21 matching lines @@
 #include "remoting/protocol/pairing_registry.h"
 #include "remoting/protocol/video_stream.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace remoting {
 
-class AudioPump;
+class AudioStream;
 class DesktopEnvironment;
 class DesktopEnvironmentFactory;
 class InputInjector;
 class MouseShapePump;
 class ScreenControls;
 
 namespace protocol {
 class VideoLayout;
 }  // namespace protocol
 
@@ skipping 33 matching lines @@
         const std::string& channel_name,
         const protocol::TransportRoute& route) = 0;
 
    protected:
     virtual ~EventHandler() {}
   };
 
   // |event_handler| and |desktop_environment_factory| must outlive |this|.
   // All |HostExtension|s in |extensions| must outlive |this|.
   ClientSession(EventHandler* event_handler,
-                scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
                 std::unique_ptr<protocol::ConnectionToClient> connection,
                 DesktopEnvironmentFactory* desktop_environment_factory,
                 const base::TimeDelta& max_duration,
                 scoped_refptr<protocol::PairingRegistry> pairing_registry,
                 const std::vector<HostExtension*>& extensions);
   ~ClientSession() override;
 
   // Returns the set of capabilities negotiated between client and host.
   const std::string& capabilities() const { return capabilities_; }
 
   // protocol::HostStub interface.
   void NotifyClientResolution(
       const protocol::ClientResolution& resolution) override;
   void ControlVideo(const protocol::VideoControl& video_control) override;
   void ControlAudio(const protocol::AudioControl& audio_control) override;
   void SetCapabilities(const protocol::Capabilities& capabilities) override;
   void RequestPairing(
       const remoting::protocol::PairingRequest& pairing_request) override;
   void DeliverClientMessage(const protocol::ExtensionMessage& message) override;
 
   // protocol::ConnectionToClient::EventHandler interface.
   void OnConnectionAuthenticating(
       protocol::ConnectionToClient* connection) override;
   void OnConnectionAuthenticated(
       protocol::ConnectionToClient* connection) override;
-  void CreateVideoStreams(protocol::ConnectionToClient* connection) override;
+  void CreateMediaStreams(protocol::ConnectionToClient* connection) override;
   void OnConnectionChannelsConnected(
       protocol::ConnectionToClient* connection) override;
   void OnConnectionClosed(protocol::ConnectionToClient* connection,
                           protocol::ErrorCode error) override;
   void OnInputEventReceived(protocol::ConnectionToClient* connection,
                             int64_t timestamp) override;
   void OnRouteChange(protocol::ConnectionToClient* connection,
                      const std::string& channel_name,
                      const protocol::TransportRoute& route) override;
 
@@ skipping 67 matching lines @@
   base::WeakPtrFactory<protocol::ClipboardStub> client_clipboard_factory_;
 
   // The maximum duration of this session.
   // There is no maximum if this value is <= 0.
   base::TimeDelta max_duration_;
 
   // A timer that triggers a disconnect when the maximum session duration
   // is reached.
   base::OneShotTimer max_duration_timer_;
 
-  scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
-
   // Objects responsible for sending video, audio and mouse shape.
-  std::unique_ptr<AudioPump> audio_pump_;
   std::unique_ptr<protocol::VideoStream> video_stream_;
+  std::unique_ptr<protocol::AudioStream> audio_stream_;
   std::unique_ptr<MouseShapePump> mouse_shape_pump_;
 
   // The set of all capabilities supported by the client.
   std::unique_ptr<std::string> client_capabilities_;
 
   // The set of all capabilities supported by the host.
   std::string host_capabilities_;
 
   // The set of all capabilities negotiated between client and host.
   std::string capabilities_;
@@ skipping 28 matching lines @@
   // Used to disable callbacks to |this| once DisconnectSession() has been
   // called.
   base::WeakPtrFactory<ClientSessionControl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSession);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CLIENT_SESSION_H_