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

content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
 
 #include "base/logging.h"
 #include "content/renderer/media/media_stream_audio_source.h"
 #include "content/renderer/media/media_stream_audio_track.h"
 #include "content/renderer/media/media_stream_track.h"
@@ skipping 60 matching lines @@
       }
     }
   }
 }
 
 void WebRtcMediaStreamAdapter::CreateAudioTrack(
     const blink::WebMediaStreamTrack& track) {
   DCHECK_EQ(track.source().getType(), blink::WebMediaStreamSource::TypeAudio);
   // A media stream is connected to a peer connection, enable the
   // peer connection mode for the sources.
-  MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::From(track);
+  MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track);
   if (!native_track) {
     DLOG(ERROR) << "No native track for blink audio track.";
     return;
   }
 
   webrtc::AudioTrackInterface* audio_track = native_track->GetAudioAdapter();
   if (!audio_track) {
     DLOG(ERROR) << "Audio track doesn't support webrtc.";
     return;
   }
 
   if (native_track->is_local_track()) {
     const blink::WebMediaStreamSource& source = track.source();
-    MediaStreamAudioSource* audio_source = MediaStreamAudioSource::From(source);
-    if (audio_source && audio_source->audio_capturer())
-      audio_source->audio_capturer()->EnablePeerConnectionMode();
+    MediaStreamAudioSource* audio_source =
+        static_cast<MediaStreamAudioSource*>(source.getExtraData());
+    if (audio_source && audio_source->GetAudioCapturer().get())
+      audio_source->GetAudioCapturer()->EnablePeerConnectionMode();
   }
 
   webrtc_media_stream_->AddTrack(audio_track);
 }
 
 void WebRtcMediaStreamAdapter::CreateVideoTrack(
     const blink::WebMediaStreamTrack& track) {
   DCHECK_EQ(track.source().getType(), blink::WebMediaStreamSource::TypeVideo);
   MediaStreamVideoWebRtcSink* adapter =
       new MediaStreamVideoWebRtcSink(track, factory_);
   video_adapters_.push_back(adapter);
   webrtc_media_stream_->AddTrack(adapter->webrtc_video_track());
 }
 
 }  // namespace content