Removed the use of WebFrame::frameForCurrentContext() in MediaStreamCenter::didStopLocalMediaStream

content/renderer/media/media_stream_center.cc

Index: content/renderer/media/media_stream_center.cc
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc
index b332c1334896a7d9c3a547d1b1dae5ba0e922939..d86c16f1eb6eb48a764e08f38bd96f2f94f3d6e6 100644
--- a/content/renderer/media/media_stream_center.cc
+++ b/content/renderer/media/media_stream_center.cc
@@ -27,15 +27,6 @@
 
 namespace content {
 
-static MediaStreamImpl* GetMediaStreamImpl(WebKit::WebFrame* web_frame) {
-  RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
-  if (!render_view)
-    return NULL;
-
-  // TODO(perkj): Avoid this cast?
-  return static_cast<MediaStreamImpl*>(render_view->userMediaClient());
-}
-
 static webrtc::MediaStreamInterface* GetNativeMediaStream(
     const WebKit::WebMediaStreamDescriptor& stream) {
   MediaStreamExtraData* extra_data =
@@ -116,16 +107,15 @@ void MediaStreamCenter::didDisableMediaStreamTrack(
 void MediaStreamCenter::didStopLocalMediaStream(
     const WebKit::WebMediaStreamDescriptor& stream) {
   DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream";
-  WebKit::WebFrame* web_frame = WebKit::WebFrame::frameForCurrentContext();
-  if (!web_frame)
-    return;
-  MediaStreamImpl* ms_impl = GetMediaStreamImpl(web_frame);
-  if (ms_impl) {
-    ms_impl->StopLocalMediaStream(stream);
+  MediaStreamExtraData* extra_data =
+       static_cast<MediaStreamExtraData*>(stream.extraData());
+  if (!extra_data) {
+    NOTREACHED();
     return;
   }
-
-  NOTREACHED();
+  if (!extra_data->stream_stop_callback().is_null()) {

[tommi (sloooow) - chröme, 2012/09/21 11:23:53]

empty line above and no {} for single line if's.

[perkj_chrome, 2012/09/21 11:56:52]

Done.

+    extra_data->stream_stop_callback().Run(stream);
+  }
 }
 
 void MediaStreamCenter::didCreateMediaStream(