Redesign the copresence audio handlers.

components/copresence/mediums/audio/audio_recorder.h

 // Copyright 2014 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 COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_RECORDER_H_
 #define COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_RECORDER_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/audio_converter.h"
 
 namespace base {
 class MessageLoop;
 }
 
 namespace media {
 class AudioBus;
 }
 
 namespace copresence {
 
 // The AudioRecorder class will record audio until told to stop.
-class AudioRecorder : public media::AudioInputStream::AudioInputCallback,
-                      public media::AudioConverter::InputCallback {
+class AudioRecorder {
  public:
-  typedef base::Callback<void(const std::string&)> DecodeSamplesCallback;
-
-  explicit AudioRecorder(const DecodeSamplesCallback& decode_callback);
+  typedef base::Callback<void(const std::string&)> RecordedSamplesCallback;
 
   // Initializes the object. Do not use this object before calling this method.
-  virtual void Initialize();
+  virtual void Initialize(const RecordedSamplesCallback& decode_callback) = 0;
 
-  virtual void Record();
-  virtual void Stop();
+  virtual void Record() = 0;
+  virtual void Stop() = 0;
 
   // Cleans up and deletes this object. Do not use object after this call.
-  virtual void Finalize();
+  virtual void Finalize() = 0;
 
-  bool IsRecording();
+  virtual bool IsRecording() = 0;
+
+ protected:
+  virtual ~AudioRecorder(){};

[Daniel Erat, 2014/10/21 19:43:22]

nit: virtual ~AudioRecorder() {}

[rkc, 2014/10/22 00:06:20]

Done.

+};
+
+// The AudioRecorder class will record audio until told to stop.
+class AudioRecorderImpl : public AudioRecorder,
+                          public media::AudioInputStream::AudioInputCallback,
+                          public media::AudioConverter::InputCallback {
+ public:
+  typedef base::Callback<void(const std::string&)> RecordedSamplesCallback;
+
+  AudioRecorderImpl();
+
+  // AudioRecorder overrides:
+  virtual void Initialize(
+      const RecordedSamplesCallback& decode_callback) override;
+  virtual void Record() override;
+  virtual void Stop() override;
+  virtual void Finalize() override;
+  virtual bool IsRecording() override;
 
   // Takes ownership of the stream.
   void set_input_stream_for_testing(
       media::AudioInputStream* input_stream_for_testing) {
     input_stream_for_testing_.reset(input_stream_for_testing);
   }
 
   // Takes ownership of the params.
   void set_params_for_testing(media::AudioParameters* params_for_testing) {
     params_for_testing_.reset(params_for_testing);
   }
 
  protected:
-  virtual ~AudioRecorder();
+  virtual ~AudioRecorderImpl();
   void set_is_recording(bool is_recording) { is_recording_ = is_recording; }
 
  private:
   friend class AudioRecorderTest;
   FRIEND_TEST_ALL_PREFIXES(AudioRecorderTest, BasicRecordAndStop);
   FRIEND_TEST_ALL_PREFIXES(AudioRecorderTest, OutOfOrderRecordAndStopMultiple);
 
   // Methods to do our various operations; all of these need to be run on the
   // audio thread.
   void InitializeOnAudioThread();
@@ skipping 16 matching lines @@
   virtual double ProvideInput(media::AudioBus* dest,
                               base::TimeDelta buffer_delay) override;
 
   // Flushes the audio loop, making sure that any queued operations are
   // performed.
   void FlushAudioLoopForTesting();
 
   bool is_recording_;
 
   media::AudioInputStream* stream_;
-  DecodeSamplesCallback decode_callback_;
+
+  RecordedSamplesCallback decode_callback_;
 
   // ProvideInput will use this buffer as its source.
   const media::AudioBus* temp_conversion_buffer_;
 
   // Outside of the ctor/Initialize method, only access the next variables on
   // the recording thread.
   scoped_ptr<media::AudioBus> buffer_;
   int total_buffer_frames_;
   int buffer_frame_index_;
 
   scoped_ptr<media::AudioConverter> converter_;
 
   scoped_ptr<media::AudioInputStream> input_stream_for_testing_;
   scoped_ptr<media::AudioParameters> params_for_testing_;
 
-  DISALLOW_COPY_AND_ASSIGN(AudioRecorder);
+  DISALLOW_COPY_AND_ASSIGN(AudioRecorderImpl);
 };
 
 }  // namespace copresence
 
 #endif  // COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_RECORDER_H_