Redesign the copresence audio handlers.

components/copresence/mediums/audio/audio_player.h

Index: components/copresence/mediums/audio/audio_player.h
diff --git a/components/copresence/mediums/audio/audio_player.h b/components/copresence/mediums/audio/audio_player.h
index 96c1f0f3bf1a267703b07fd221bc59b5e6993e26..3c92e5dc0bd38d789f06ea23ca96bcb0a98ccbe1 100644
--- a/components/copresence/mediums/audio/audio_player.h
+++ b/components/copresence/mediums/audio/audio_player.h
@@ -7,89 +7,36 @@
 
 #include <vector>
 
-#include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/synchronization/lock.h"
-#include "media/audio/audio_io.h"
 
 namespace media {
-class AudioBus;
 class AudioBusRefCounted;
 }
 
 namespace copresence {
 
-// The AudioPlayer class will play a set of samples till it is told to stop.
-class AudioPlayer : public media::AudioOutputStream::AudioSourceCallback {
+// The AudioPlayerImpl class will play a set of samples till it is told to stop.
+class AudioPlayer {
  public:
-  AudioPlayer();
-
   // Initializes the object. Do not use this object before calling this method.
-  virtual void Initialize();
+  virtual void Initialize() = 0;
 
   // Play the given samples. These samples will keep on being played in a loop
   // till we explicitly tell the player to stop playing.
-  virtual void Play(const scoped_refptr<media::AudioBusRefCounted>& samples);
+  virtual void Play(
+      const scoped_refptr<media::AudioBusRefCounted>& samples) = 0;
 
   // Stop playing.
-  virtual void Stop();
+  virtual void Stop() = 0;
 
   // Cleans up and deletes this object. Do not use object after this call.
-  virtual void Finalize();
-
-  bool IsPlaying();
+  virtual void Finalize() = 0;
 
-  // Takes ownership of the stream.
-  void set_output_stream_for_testing(
-      media::AudioOutputStream* output_stream_for_testing) {
-    output_stream_for_testing_.reset(output_stream_for_testing);
-  }
+  virtual bool IsPlaying() = 0;
 
  protected:
-  virtual ~AudioPlayer();
-  void set_is_playing(bool is_playing) { is_playing_ = is_playing; }
-
- private:
-  friend class AudioPlayerTest;
-  FRIEND_TEST_ALL_PREFIXES(AudioPlayerTest, BasicPlayAndStop);
-  FRIEND_TEST_ALL_PREFIXES(AudioPlayerTest, OutOfOrderPlayAndStopMultiple);
-
-  // Methods to do our various operations; all of these need to be run on the
-  // audio thread.
-  void InitializeOnAudioThread();
-  void PlayOnAudioThread(
-      const scoped_refptr<media::AudioBusRefCounted>& samples);
-  void StopOnAudioThread();
-  void StopAndCloseOnAudioThread();
-  void FinalizeOnAudioThread();
-
-  // AudioOutputStream::AudioSourceCallback overrides:
-  // Following methods could be called from *ANY* thread.
-  virtual int OnMoreData(media::AudioBus* dest,
-                         uint32 total_bytes_delay) override;
-  virtual void OnError(media::AudioOutputStream* stream) override;
-
-  // Flushes the audio loop, making sure that any queued operations are
-  // performed.
-  void FlushAudioLoopForTesting();
-
-  bool is_playing_;
-
-  // Self-deleting object.
-  media::AudioOutputStream* stream_;
-
-  scoped_ptr<media::AudioOutputStream> output_stream_for_testing_;
-
-  // All fields below here are protected by this lock.
-  base::Lock state_lock_;
-
-  scoped_refptr<media::AudioBusRefCounted> samples_;
-
-  // Index to the frame in the samples that we need to play next.
-  int frame_index_;
-
-  DISALLOW_COPY_AND_ASSIGN(AudioPlayer);
+  virtual ~AudioPlayer() {}
 };
 
 }  // namespace copresence