Revert r21137 to fix Chromium mac valgrind

TBR=scherkus

Review URL: http://codereview.chromium.org/159122

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21154 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 17 insertions, 10 deletions

diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc
index 08075de..e7dab51 100644
--- a/media/audio/linux/alsa_output.cc
+++ b/media/audio/linux/alsa_output.cc
@@ -527,3 +527,7 @@ void AlsaPCMOutputStream::SetVolume(double left_level, double right_level) {
 void AlsaPCMOutputStream::GetVolume(double* left_level, double* right_level) {
   NOTIMPLEMENTED();
 }
+
+size_t AlsaPCMOutputStream::GetNumBuffers() {
+  return 0;
+}
diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h
index 850ab7f..42cd3c8 100644
--- a/media/audio/linux/alsa_output.h
+++ b/media/audio/linux/alsa_output.h
@@ -65,6 +65,7 @@ class AlsaPCMOutputStream :
   virtual void Stop();
   virtual void SetVolume(double left_level, double right_level);
   virtual void GetVolume(double* left_level, double* right_level);
+  virtual size_t GetNumBuffers();
 
  private:
   // Closes the playback handle, reporting errors if any occur.  Returns true
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index a9d299f..69e8b9b 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -6,7 +6,6 @@
 
 #include "base/at_exit.h"
 #include "base/logging.h"
-#include "media/audio/fake_audio_output_stream.h"
 #include "media/audio/linux/alsa_output.h"
 
 namespace {
@@ -28,15 +27,11 @@ AudioOutputStream* AudioManagerLinux::MakeAudioStream(Format format,
   // surround40, surround51, etc.
   //
   // http://0pointer.de/blog/projects/guide-to-sound-apis.html
-  if (format == AudioManager::AUDIO_MOCK) {
-    return FakeAudioOutputStream::MakeFakeStream();
-  } else {
-    AlsaPCMOutputStream* stream =
-        new AlsaPCMOutputStream(AlsaPCMOutputStream::kDefaultDevice,
-                                100 /* 100ms minimal buffer */,
-                                format, channels, sample_rate, bits_per_sample);
-    return stream;
-  }
+  AlsaPCMOutputStream* stream =
+      new AlsaPCMOutputStream(AlsaPCMOutputStream::kDefaultDevice,
+                              100 /* 100ms minimal buffer */,
+                              format, channels, sample_rate, bits_per_sample);
+  return stream;
 }
 
 AudioManagerLinux::AudioManagerLinux() {
@@ -55,6 +50,12 @@ void AudioManagerLinux::UnMuteAll() {
   NOTIMPLEMENTED();
 }
 
+const void* AudioManagerLinux::GetLastMockBuffer() {
+  // TODO(ajwong): Implement.
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
 // TODO(ajwong): Collapse this with the windows version.
 void DestroyAudioManagerLinux(void* not_used) {
   delete g_audio_manager;
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 191e687..5b369a1 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -19,6 +19,7 @@ class AudioManagerLinux : public AudioManager {
                                              char bits_per_sample);
   virtual void MuteAll();
   virtual void UnMuteAll();
+  virtual const void* GetLastMockBuffer();
 
  private:
   // Friend function for invoking the private destructor at exit.