Clean up the media stream audio track code

content/renderer/media/media_stream_audio_track_sink.h

Index: content/renderer/media/media_stream_audio_track_sink.h
diff --git a/content/renderer/media/media_stream_audio_track_sink.h b/content/renderer/media/media_stream_audio_track_sink.h
index 6e511bd65347071fa66e8360f53c64f247602b5a..dc21245f1b7cde3a61d874943f1af79d4ed21df8 100644
--- a/content/renderer/media/media_stream_audio_track_sink.h
+++ b/content/renderer/media/media_stream_audio_track_sink.h
@@ -15,21 +15,15 @@
 namespace content {
 
 class MediaStreamAudioSink;
-class PeerConnectionAudioSink;
 
 // Interface for reference counted holder of audio stream audio track sink.
 class MediaStreamAudioTrackSink
     : public base::RefCountedThreadSafe<MediaStreamAudioTrackSink> {
  public:
-   virtual int OnData(const int16* audio_data,
+  virtual void OnData(const int16* audio_data,
                       int sample_rate,
                       int number_of_channels,
-                      int number_of_frames,
-                      const std::vector<int>& channels,
-                      int audio_delay_milliseconds,
-                      int current_volume,
-                      bool need_audio_processing,
-                      bool key_pressed) = 0;
+                      int number_of_frames) = 0;
 
   virtual void OnSetFormat(const media::AudioParameters& params) = 0;
 
@@ -39,7 +33,6 @@ class MediaStreamAudioTrackSink
   virtual void Reset() = 0;
 
   virtual bool IsEqual(const MediaStreamAudioSink* other) const = 0;
-  virtual bool IsEqual(const PeerConnectionAudioSink* other) const = 0;
 
   // Wrapper which allows to use std::find_if() when adding and removing
   // sinks to/from the list.
@@ -51,14 +44,6 @@ class MediaStreamAudioTrackSink
     }
     MediaStreamAudioSink* sink_;
   };
-  struct WrapsPeerConnectionSink {
-    WrapsPeerConnectionSink(PeerConnectionAudioSink* sink) : sink_(sink) {}
-    bool operator()(
-        const scoped_refptr<MediaStreamAudioTrackSink>& owner) const {
-      return owner->IsEqual(sink_);
-    }
-    PeerConnectionAudioSink* sink_;
-  };
 
  protected:
   virtual ~MediaStreamAudioTrackSink() {}