Using the new WebMediaStreamTrack::ExtraData to simplify the code

Always store the native MediaStreamTrackInterface in the ExtraData field.

This patch doesn't change the current behavior.

BUG=294145

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

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

1 files changed, 2 insertions, 26 deletions

diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc
index 31119ae..c3ae47a 100644
--- a/content/renderer/media/media_stream_center.cc
+++ b/content/renderer/media/media_stream_center.cc
@@ -33,30 +33,6 @@ using WebKit::WebView;
 
 namespace content {
 
-static webrtc::MediaStreamInterface* GetNativeMediaStream(
-    const WebKit::WebMediaStream& stream) {
-  MediaStreamExtraData* extra_data =
-      static_cast<MediaStreamExtraData*>(stream.extraData());
-  return extra_data->stream().get();
-}
-
-static webrtc::MediaStreamTrackInterface* GetNativeMediaStreamTrack(
-      const WebKit::WebMediaStream& stream,
-      const WebKit::WebMediaStreamTrack& component) {
-  std::string track_id = UTF16ToUTF8(component.id());
-  webrtc::MediaStreamInterface* native_stream = GetNativeMediaStream(stream);
-  if (native_stream) {
-    if (component.source().type() == WebKit::WebMediaStreamSource::TypeAudio) {
-      return native_stream->FindAudioTrack(track_id);
-    }
-    if (component.source().type() == WebKit::WebMediaStreamSource::TypeVideo) {
-      return native_stream->FindVideoTrack(track_id);
-    }
-  }
-  NOTREACHED();
-  return NULL;
-}
-
 MediaStreamCenter::MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client,
                                      MediaStreamDependencyFactory* factory)
     : rtc_factory_(factory), next_request_id_(0) {}
@@ -80,7 +56,7 @@ void MediaStreamCenter::didEnableMediaStreamTrack(
     const WebKit::WebMediaStream& stream,
     const WebKit::WebMediaStreamTrack& component) {
   webrtc::MediaStreamTrackInterface* track =
-      GetNativeMediaStreamTrack(stream, component);
+      MediaStreamDependencyFactory::GetNativeMediaStreamTrack(component);
   if (track)
     track->set_enabled(true);
 }
@@ -89,7 +65,7 @@ void MediaStreamCenter::didDisableMediaStreamTrack(
     const WebKit::WebMediaStream& stream,
     const WebKit::WebMediaStreamTrack& component) {
   webrtc::MediaStreamTrackInterface* track =
-      GetNativeMediaStreamTrack(stream, component);
+      MediaStreamDependencyFactory::GetNativeMediaStreamTrack(component);
   if (track)
     track->set_enabled(false);
 }