Clean up the media stream audio track code

content/renderer/media/webrtc_local_audio_track.h

Index: content/renderer/media/webrtc_local_audio_track.h
diff --git a/content/renderer/media/webrtc_local_audio_track.h b/content/renderer/media/webrtc_local_audio_track.h
index fa8b05995bbdd08e054289560e55a89860b7b285..52073da05e3bcda775c33be016cc2503c0b334d9 100644
--- a/content/renderer/media/webrtc_local_audio_track.h
+++ b/content/renderer/media/webrtc_local_audio_track.h
@@ -13,7 +13,7 @@
 #include "base/threading/thread_checker.h"
 #include "content/renderer/media/media_stream_track.h"
 #include "content/renderer/media/tagged_list.h"
-#include "content/renderer/media/webrtc_audio_device_impl.h"
+#include "media/audio/audio_parameters.h"
 
 namespace content {
 
@@ -22,7 +22,6 @@ class MediaStreamAudioProcessor;
 class MediaStreamAudioSink;
 class MediaStreamAudioSinkOwner;
 class MediaStreamAudioTrackSink;
-class PeerConnectionAudioSink;
 class WebAudioCapturerSource;
 class WebRtcAudioCapturer;
 class WebRtcLocalAudioTrackAdapter;
@@ -50,12 +49,6 @@ class CONTENT_EXPORT WebRtcLocalAudioTrack
   // Called on the main render thread.
   void RemoveSink(MediaStreamAudioSink* sink);
 
-  // Add/remove PeerConnection sink to/from the track.
-  // TODO(xians): Remove these two methods after PeerConnection can use the
-  // same sink interface as MediaStreamAudioSink.
-  void AddSink(PeerConnectionAudioSink* sink);
-  void RemoveSink(PeerConnectionAudioSink* sink);
-
   // Starts the local audio track. Called on the main render thread and
   // should be called only once when audio track is created.
   void Start();
@@ -72,12 +65,7 @@ class CONTENT_EXPORT WebRtcLocalAudioTrack
 
   // Method called by the capturer to deliver the capture data.
   // Called on the capture audio thread.
-  void Capture(const int16* audio_data,
-               base::TimeDelta delay,
-               int volume,
-               bool key_pressed,
-               bool need_audio_processing,
-               bool force_report_nonzero_energy);
+  void Capture(const int16* audio_data, bool force_report_nonzero_energy);
 
   // Method called by the capturer to set the audio parameters used by source
   // of the capture data..