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

content/renderer/media/media_stream_center.cc

 // Copyright (c) 2012 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/media_stream_center.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/libjingle/source/talk/app/webrtc/jsep.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSourcesRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSessionDescriptionDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
 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 =
       static_cast<MediaStreamExtraData*>(stream.extraData());
   if (extra_data && extra_data->remote_stream())
     return extra_data->remote_stream();
 
   if (extra_data && extra_data->local_stream())
     return extra_data->local_stream();
 
@@ skipping 60 matching lines @@
     const WebKit::WebMediaStreamComponent& component) {
   webrtc::MediaStreamTrackInterface* track =
       GetNativeMediaStreamTrack(stream, component);
   if (track)
     track->set_enabled(false);
 }
 
 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);
-    return;
-  }
-
-  NOTREACHED();
+  MediaStreamExtraData* extra_data =
+       static_cast<MediaStreamExtraData*>(stream.extraData());
+  return extra_data->RunStreamStopCallback();

[tommi (sloooow) - chröme, 2012/09/21 09:18:03]

no need for return statements in void functions

[perkj_chrome, 2012/09/21 10:47:10]

Done.

 }
 
 void MediaStreamCenter::didCreateMediaStream(
     WebKit::WebMediaStreamDescriptor& stream) {
   if (!rtc_factory_)
     return;
   rtc_factory_->CreateNativeLocalMediaStream(&stream);
 }
 
 WebKit::WebString MediaStreamCenter::constructSDP(
@@ skipping 42 matching lines @@
     }
   }
 
   std::string sdp;
   if (!native_desc->ToString(&sdp))
     LOG(ERROR) << "Could not create SDP string";
   return UTF8ToUTF16(sdp);
 }
 
 }  // namespace content