Redesign the copresence audio handlers.

components/copresence/mediums/audio/audio_recorder_unittest.cc

 // 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.
 
 #include "components/copresence/mediums/audio/audio_recorder.h"
 
 #include "base/bind.h"
 #include "base/memory/aligned_memory.h"
 #include "base/run_loop.h"
+#include "components/copresence/mediums/audio/audio_recorder_impl.h"
 #include "components/copresence/public/copresence_constants.h"
 #include "components/copresence/test/audio_test_support.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/base/audio_bus.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
@@ skipping 58 matching lines @@
   }
 
   virtual ~AudioRecorderTest() {
     DeleteRecorder();
     for (size_t i = 0; i < channel_data_.size(); ++i)
       base::AlignedFree(channel_data_[i]);
   }
 
   void CreateSimpleRecorder() {
     DeleteRecorder();
-    recorder_ = new AudioRecorder(
+    recorder_ = new AudioRecorderImpl();
+    recorder_->Initialize(
         base::Bind(&AudioRecorderTest::DecodeSamples, base::Unretained(this)));
-    recorder_->Initialize();
   }
 
   void CreateRecorder(size_t channels,
                       size_t sample_rate,
                       size_t bits_per_sample,
                       size_t samples) {
     DeleteRecorder();
     params_.Reset(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
                   kDefaultChannelLayout,
                   channels,
                   sample_rate,
                   bits_per_sample,
                   4096);
 
     channel_data_.clear();
     channel_data_.push_back(GenerateSamples(0x1337, samples));
     channel_data_.push_back(GenerateSamples(0x7331, samples));
 
     total_samples_ = samples;
 
-    recorder_ = new AudioRecorder(
-        base::Bind(&AudioRecorderTest::DecodeSamples, base::Unretained(this)));
+    recorder_ = new AudioRecorderImpl();
     recorder_->set_input_stream_for_testing(
         new TestAudioInputStream(params_, channel_data_, samples));
     recorder_->set_params_for_testing(new media::AudioParameters(params_));
-    recorder_->Initialize();
+    recorder_->Initialize(
+        base::Bind(&AudioRecorderTest::DecodeSamples, base::Unretained(this)));
   }
 
   void DeleteRecorder() {
     if (!recorder_)
       return;
     recorder_->Finalize();
     recorder_ = NULL;
   }
 
   void RecordAndVerifySamples() {
@@ skipping 47 matching lines @@
   }
   bool IsRecording() {
     recorder_->FlushAudioLoopForTesting();
     return recorder_->is_recording_;
   }
 
   std::vector<float*> channel_data_;
   media::AudioParameters params_;
   size_t total_samples_;
 
-  AudioRecorder* recorder_;
+  // Deleted by calling Finalize() on the object.
+  AudioRecorderImpl* recorder_;
 
   std::string received_samples_;
 
   scoped_ptr<base::RunLoop> run_loop_;
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 // TODO(rkc): These tests are broken on all platforms.
 // On Windows and Mac, we cannot use non-OS params. The tests need to be
 // rewritten to use the params provided to us by the audio manager
@@ skipping 49 matching lines @@
       kDefaultChannels, kDefaultSampleRate, kDefaultBitsPerSample, kNumSamples);
 
   RecordAndVerifySamples();
 
   DeleteRecorder();
 }
 
 // TODO(rkc): Add tests with recording different sample rates.
 
 }  // namespace copresence