Remove unused flush operation from Chromium audio.

BUG=151051,114697
TBR=cdn

Review URL: https://codereview.chromium.org/14234023

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

6 files changed, 2 insertions, 29 deletions

diff --git a/content/browser/media/media_internals.h b/content/browser/media/media_internals.h
index 5c901d5..68e056f 100644
--- a/content/browser/media/media_internals.h
+++ b/content/browser/media/media_internals.h
@@ -39,8 +39,8 @@ class CONTENT_EXPORT MediaInternals {
   virtual void OnSetAudioStreamPlaying(void* host, int stream_id,
                                        bool playing);
 
-  // Called when the status of an audio stream is set to "created", "flushed",
-  // "closed", or "error".
+  // Called when the status of an audio stream is set to "created", "closed", or
+  // "error".
   virtual void OnSetAudioStreamStatus(void* host, int stream_id,
                                       const std::string& status);
 
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 2aee887..7312f8d 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -261,7 +261,6 @@ bool AudioRendererHost::OnMessageReceived(const IPC::Message& message,
                         OnAssociateStreamWithProducer)
     IPC_MESSAGE_HANDLER(AudioHostMsg_PlayStream, OnPlayStream)
     IPC_MESSAGE_HANDLER(AudioHostMsg_PauseStream, OnPauseStream)
-    IPC_MESSAGE_HANDLER(AudioHostMsg_FlushStream, OnFlushStream)
     IPC_MESSAGE_HANDLER(AudioHostMsg_CloseStream, OnCloseStream)
     IPC_MESSAGE_HANDLER(AudioHostMsg_SetVolume, OnSetVolume)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -374,20 +373,6 @@ void AudioRendererHost::OnPauseStream(int stream_id) {
     media_internals_->OnSetAudioStreamPlaying(this, stream_id, false);
 }
 
-void AudioRendererHost::OnFlushStream(int stream_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  AudioEntry* entry = LookupById(stream_id);
-  if (!entry) {
-    SendErrorMessage(stream_id);
-    return;
-  }
-
-  entry->controller()->Flush();
-  if (media_internals_)
-    media_internals_->OnSetAudioStreamStatus(this, stream_id, "flushed");
-}
-
 void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 794cc71..917dc2a 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -109,9 +109,6 @@ class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter {
   // Pause the audio stream referenced by |stream_id|.
   void OnPauseStream(int stream_id);
 
-  // Discard all audio data in stream referenced by |stream_id|.
-  void OnFlushStream(int stream_id);
-
   // Close the audio stream referenced by |stream_id|.
   void OnCloseStream(int stream_id);
 
diff --git a/content/common/media/audio_messages.h b/content/common/media/audio_messages.h
index 63b81e4..0a20c7a 100644
--- a/content/common/media/audio_messages.h
+++ b/content/common/media/audio_messages.h
@@ -122,10 +122,6 @@ IPC_MESSAGE_CONTROL1(AudioInputHostMsg_RecordStream,
 IPC_MESSAGE_CONTROL1(AudioHostMsg_PauseStream,
                      int /* stream_id */)
 
-// Discard all buffered audio data for the specified audio stream.
-IPC_MESSAGE_CONTROL1(AudioHostMsg_FlushStream,
-                     int /* stream_id */)
-
 // Close an audio stream specified by stream_id.
 IPC_MESSAGE_CONTROL1(AudioHostMsg_CloseStream,
                      int /* stream_id */)
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc
index 11de086..a3bcf65 100644
--- a/content/renderer/media/audio_message_filter.cc
+++ b/content/renderer/media/audio_message_filter.cc
@@ -56,10 +56,6 @@ void AudioMessageFilter::PauseStream(int stream_id) {
   Send(new AudioHostMsg_PauseStream(stream_id));
 }
 
-void AudioMessageFilter::FlushStream(int stream_id) {
-  Send(new AudioHostMsg_FlushStream(stream_id));
-}
-
 void AudioMessageFilter::CloseStream(int stream_id) {
   Send(new AudioHostMsg_CloseStream(stream_id));
 }
diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h
index 7c352d6..d60c80c 100644
--- a/content/renderer/media/audio_message_filter.h
+++ b/content/renderer/media/audio_message_filter.h
@@ -47,7 +47,6 @@ class CONTENT_EXPORT AudioMessageFilter
                             const media::AudioParameters& params) OVERRIDE;
   virtual void PlayStream(int stream_id) OVERRIDE;
   virtual void PauseStream(int stream_id) OVERRIDE;
-  virtual void FlushStream(int stream_id) OVERRIDE;
   virtual void CloseStream(int stream_id) OVERRIDE;
   virtual void SetVolume(int stream_id, double volume) OVERRIDE;