Remove dependency on AudioStub in ConnectionToClient

remoting/protocol/ice_connection_to_client.h

 // Copyright 2015 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_PROTOCOL_ICE_CONNECTION_TO_CLIENT_H_
 #define REMOTING_PROTOCOL_ICE_CONNECTION_TO_CLIENT_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 20 matching lines @@
 // host. It sets up all protocol channels and connects them to the
 // stubs.
 class IceConnectionToClient : public ConnectionToClient,
                               public Session::EventHandler,
                               public IceTransport::EventHandler,
                               public ChannelDispatcherBase::EventHandler {
  public:
   IceConnectionToClient(
       std::unique_ptr<Session> session,
       scoped_refptr<TransportContext> transport_context,
-      scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner);
+      scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner);
   ~IceConnectionToClient() override;
 
   // ConnectionToClient interface.
   void SetEventHandler(
       ConnectionToClient::EventHandler* event_handler) override;
   Session* session() override;
   void Disconnect(ErrorCode error) override;
   void OnInputEventReceived(int64_t timestamp) override;
   std::unique_ptr<VideoStream> StartVideoStream(
       std::unique_ptr<webrtc::DesktopCapturer> desktop_capturer) override;
-  AudioStub* audio_stub() override;
+  std::unique_ptr<AudioSendStream> StartAudioStream(
+      std::unique_ptr<AudioSource> audio_source) override;
   ClientStub* client_stub() override;
   void set_clipboard_stub(ClipboardStub* clipboard_stub) override;
   void set_host_stub(HostStub* host_stub) override;
   void set_input_stub(InputStub* input_stub) override;
 
  private:
   // Session::EventHandler interface.
   void OnSessionStateChange(Session::State state) override;
 
   // IceTransport::EventHandler interface.
@@ skipping 10 matching lines @@
   void CloseChannels();
 
   base::ThreadChecker thread_checker_;
 
   // Event handler for handling events sent from this object.
   ConnectionToClient::EventHandler* event_handler_;
 
   std::unique_ptr<Session> session_;
 
   scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
 
   IceTransport transport_;
 
   std::unique_ptr<HostControlDispatcher> control_dispatcher_;
   std::unique_ptr<HostEventDispatcher> event_dispatcher_;
   std::unique_ptr<HostVideoDispatcher> video_dispatcher_;
   std::unique_ptr<AudioWriter> audio_writer_;
 
   DISALLOW_COPY_AND_ASSIGN(IceConnectionToClient);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_ICE_CONNECTION_TO_CLIENT_H_