Redesign the copresence audio handlers.

components/copresence/mediums/audio/audio_recorder.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 <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 21 matching lines @@
   for (int ch = 0; ch < channels; ++ch) {
     for (int si = 0, di = ch; si < source->frames(); ++si, di += channels)
       buffer_view[di] = source->channel(ch)[si];
   }
 }
 
 // Called every kProcessIntervalMs to process the recorded audio. This
 // converts our samples to the required sample rate, interleaves the samples
 // and sends them to the whispernet decoder to process.
 void ProcessSamples(scoped_ptr<media::AudioBus> bus,
-                    const AudioRecorder::DecodeSamplesCallback& callback) {
+                    const AudioRecorder::RecordedSamplesCallback& callback) {
   std::string samples;
   AudioBusToString(bus.Pass(), &samples);
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE, base::Bind(callback, samples));
 }
 
 }  // namespace
 
 // Public methods.
 
-AudioRecorder::AudioRecorder(const DecodeSamplesCallback& decode_callback)
+AudioRecorder::AudioRecorder()
     : is_recording_(false),
       stream_(NULL),
-      decode_callback_(decode_callback),
+      temp_conversion_buffer_(NULL),
       total_buffer_frames_(0),
       buffer_frame_index_(0) {
 }
 
-void AudioRecorder::Initialize() {
+void AudioRecorder::Initialize(const RecordedSamplesCallback& decode_callback) {
+  decode_callback_ = decode_callback;
   media::AudioManager::Get()->GetTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&AudioRecorder::InitializeOnAudioThread,
                  base::Unretained(this)));
 }
 
 AudioRecorder::~AudioRecorder() {
 }
 
 void AudioRecorder::Record() {
@@ skipping 170 matching lines @@
   base::RunLoop rl;
   media::AudioManager::Get()->GetTaskRunner()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(base::IgnoreResult(&AudioRecorder::FlushAudioLoopForTesting),
                  base::Unretained(this)),
       rl.QuitClosure());
   rl.Run();
 }
 
 }  // namespace copresence