Moved the fake input stream's processing onto the audio worker thread.

media/audio/virtual_audio_input_stream.h

 // Copyright (c) 2012 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 MEDIA_AUDIO_VIRTUAL_AUDIO_INPUT_STREAM_H_
 #define MEDIA_AUDIO_VIRTUAL_AUDIO_INPUT_STREAM_H_
 
 #include <map>
 #include <set>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
-#include "media/audio/fake_audio_consumer.h"
+#include "media/audio/fake_audio_worker.h"
 #include "media/base/audio_converter.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class LoopbackAudioConverter;
 class VirtualAudioOutputStream;
@@ skipping 42 matching lines @@
                                   const AudioParameters& output_params);
 
  private:
   friend class VirtualAudioInputStreamTest;
 
   typedef std::map<AudioParameters, LoopbackAudioConverter*> AudioConvertersMap;
 
   // Pulls audio data from all attached VirtualAudioOutputStreams, mixes and
   // converts the streams into one, and pushes the result to |callback_|.
   // Invoked on the worker thread.
-  void PumpAudio(AudioBus* audio_bus);
+  void PumpAudio();
 
   const scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner_;
 
   AfterCloseCallback after_close_cb_;
 
   AudioInputCallback* callback_;
 
   // Non-const for testing.
   scoped_ptr<uint8[]> buffer_;
   AudioParameters params_;
 
   // Guards concurrent access to the converter network: converters_, mixer_, and
   // num_attached_output_streams_.
   base::Lock converter_network_lock_;
 
   // AudioConverters associated with the attached VirtualAudioOutputStreams,
   // partitioned by common AudioParameters.
   AudioConvertersMap converters_;
 
   // AudioConverter that takes all the audio converters and mixes them into one
   // final audio stream.
   AudioConverter mixer_;
 
   // Number of currently attached VirtualAudioOutputStreams.
   int num_attached_output_streams_;
 
   // Handles callback timing for consumption of audio data.
-  FakeAudioConsumer fake_consumer_;
+  FakeAudioWorker fake_worker_;
+
+  scoped_ptr<AudioBus> audio_bus_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(VirtualAudioInputStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_VIRTUAL_AUDIO_INPUT_STREAM_H_