Revert of MediaStream audio object graph untangling and clean-ups.

content/renderer/media/media_stream_audio_track.cc

Index: content/renderer/media/media_stream_audio_track.cc
diff --git a/content/renderer/media/media_stream_audio_track.cc b/content/renderer/media/media_stream_audio_track.cc
index 31c12a04bc622fd836c1fba9c791eb90271d5f83..b7c40747b67af5c735acf6a9eb05198b98646738 100644
--- a/content/renderer/media/media_stream_audio_track.cc
+++ b/content/renderer/media/media_stream_audio_track.cc
@@ -4,7 +4,6 @@
 
 #include "content/renderer/media/media_stream_audio_track.h"
 
-#include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/webrtc/api/mediastreaminterface.h"
@@ -13,19 +12,13 @@
 
 MediaStreamAudioTrack::MediaStreamAudioTrack(bool is_local_track)
     : MediaStreamTrack(is_local_track) {
-  DVLOG(1) << "MediaStreamAudioTrack::MediaStreamAudioTrack(is a "
-           << (is_local_track ? "local" : "remote") << " track)";
 }
 
 MediaStreamAudioTrack::~MediaStreamAudioTrack() {
-  DCHECK(main_render_thread_checker_.CalledOnValidThread());
-  DVLOG(1) << "MediaStreamAudioTrack::~MediaStreamAudioTrack()";
-  DCHECK(stop_callback_.is_null())
-      << "BUG: Subclass must ensure Stop() is called.";
 }
 
 // static
-MediaStreamAudioTrack* MediaStreamAudioTrack::From(
+MediaStreamAudioTrack* MediaStreamAudioTrack::GetTrack(
     const blink::WebMediaStreamTrack& track) {
   if (track.isNull() ||
       track.source().getType() != blink::WebMediaStreamSource::TypeAudio) {
@@ -34,24 +27,6 @@
   return static_cast<MediaStreamAudioTrack*>(track.extraData());
 }
 
-void MediaStreamAudioTrack::Start(const base::Closure& stop_callback) {
-  DCHECK(main_render_thread_checker_.CalledOnValidThread());
-  DCHECK(!stop_callback.is_null());
-  DCHECK(stop_callback_.is_null());
-  DVLOG(1) << "MediaStreamAudioTrack::Start()";
-  stop_callback_ = stop_callback;
-}
-
-void MediaStreamAudioTrack::Stop() {
-  DCHECK(main_render_thread_checker_.CalledOnValidThread());
-  DVLOG(1) << "MediaStreamAudioTrack::Stop()";
-  if (!stop_callback_.is_null())
-    base::ResetAndReturn(&stop_callback_).Run();
-  OnStop();
-}
-
-void MediaStreamAudioTrack::OnStop() {}
-
 webrtc::AudioTrackInterface* MediaStreamAudioTrack::GetAudioAdapter() {
   NOTREACHED();
   return nullptr;