Switch OnMoreData() to use AudioBus.

content/browser/renderer_host/media/audio_sync_reader.h

Index: content/browser/renderer_host/media/audio_sync_reader.h
diff --git a/content/browser/renderer_host/media/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h
index eec238c1f15e70058bed60e03875dcaac2251833..746e37584989a58d4e0563f12511e15c9eba0cbb 100644
--- a/content/browser/renderer_host/media/audio_sync_reader.h
+++ b/content/browser/renderer_host/media/audio_sync_reader.h
@@ -11,6 +11,7 @@
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "media/audio/audio_output_controller.h"
+#include "media/base/audio_bus.h"
 
 namespace base {
 class SharedMemory;
@@ -22,13 +23,14 @@ class SharedMemory;
 // process.
 class AudioSyncReader : public media::AudioOutputController::SyncReader {
  public:
-  explicit AudioSyncReader(base::SharedMemory* shared_memory);
+  AudioSyncReader(base::SharedMemory* shared_memory,
+                  const media::AudioParameters& params);
 
   virtual ~AudioSyncReader();
 
   // media::AudioOutputController::SyncReader implementations.
   virtual void UpdatePendingBytes(uint32 bytes) OVERRIDE;
-  virtual uint32 Read(void* data, uint32 size) OVERRIDE;
+  virtual int Read(media::AudioBus* audio_bus) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual bool DataReady() OVERRIDE;
 
@@ -51,6 +53,12 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {
   // PrepareForeignSocketHandle() is called and ran successfully.
   scoped_ptr<base::CancelableSyncSocket> foreign_socket_;
 
+  // Shared memory wrapper used for transferring audio data to Read() callers.
+  scoped_ptr<media::AudioBus> audio_bus_;
+
+  // Maximum amount of audio data which can be transferred in one Read() call.
+  int packet_size_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioSyncReader);
 };