Replace AudioScheduler with AudioPump.

remoting/host/audio_pump.h

Index: remoting/host/audio_pump.h
diff --git a/remoting/host/audio_scheduler.h b/remoting/host/audio_pump.h
similarity index 50%
rename from remoting/host/audio_scheduler.h
rename to remoting/host/audio_pump.h
index b47b226013a344ddc9cf1024d35239160a465885..21346674ca105bb053934b7e2db83b3f9510a1cd 100644
--- a/remoting/host/audio_scheduler.h
+++ b/remoting/host/audio_pump.h
@@ -1,12 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_HOST_AUDIO_SCHEDULER_H_
-#define REMOTING_HOST_AUDIO_SCHEDULER_H_
+#ifndef REMOTING_HOST_AUDIO_PUMP_H_
+#define REMOTING_HOST_AUDIO_PUMP_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/threading/non_thread_safe.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -22,28 +24,21 @@ class AudioCapturer;
 class AudioEncoder;
 class AudioPacket;
 
-// AudioScheduler is responsible for fetching audio data from the AudioCapturer
+// AudioPump is responsible for fetching audio data from the AudioCapturer
 // and encoding it before passing it to the AudioStub for delivery to the
 // client. Audio is captured and encoded on the audio thread and then passed to
 // AudioStub on the network thread.
-class AudioScheduler : public base::RefCountedThreadSafe<AudioScheduler> {
+class AudioPump : public base::NonThreadSafe {
  public:
-  // Audio capture and encoding tasks are dispatched via the
-  // |audio_task_runner|. |audio_stub| tasks are dispatched via the
-  // |network_task_runner|. The caller must ensure that the |audio_capturer| and
-  // |audio_stub| exist until the scheduler is stopped using Stop() method.
-  AudioScheduler(
+  // The caller must ensure that the |audio_stub| is not destroyed until the
+  // pump is destroyed.
+  AudioPump(
       scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
       scoped_ptr<AudioCapturer> audio_capturer,
       scoped_ptr<AudioEncoder> audio_encoder,
       protocol::AudioStub* audio_stub);
-
-  // Starts the recording session.
-  void Start();
-
-  // Stops the recording session.
-  void Stop();
+  virtual ~AudioPump();
 
   // Pauses or resumes audio on a running session. This leaves the audio
   // capturer running, and only affects whether or not the captured audio is
@@ -51,35 +46,21 @@ class AudioScheduler : public base::RefCountedThreadSafe<AudioScheduler> {
   void Pause(bool pause);
 
  private:
-  friend class base::RefCountedThreadSafe<AudioScheduler>;
-  virtual ~AudioScheduler();
-
-  // Called on the audio thread to start capturing.
-  void StartOnAudioThread();
-
-  // Called on the audio thread to stop capturing.
-  void StopOnAudioThread();
-
-  // Called on the audio thread when a new audio packet is available.
-  void EncodeAudioPacket(scoped_ptr<AudioPacket> packet);
+  class Core;
 
   // Called on the network thread to send a captured packet to the audio stub.
   void SendAudioPacket(scoped_ptr<AudioPacket> packet);
 
   scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
-  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
-
-  scoped_ptr<AudioCapturer> audio_capturer_;
-
-  scoped_ptr<AudioEncoder> audio_encoder_;
-
   protocol::AudioStub* audio_stub_;
 
-  bool enabled_;
+  scoped_ptr<Core> core_;
+
+  base::WeakPtrFactory<AudioPump> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(AudioScheduler);
+  DISALLOW_COPY_AND_ASSIGN(AudioPump);
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_AUDIO_SCHEDULER_H_
+#endif  // REMOTING_HOST_AUDIO_PUMP_H_