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

content/renderer/media/media_stream_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 33 matching lines @@
       public base::SupportsWeakPtr<MediaStreamImpl>,
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   MediaStreamImpl(
       content::RenderView* render_view,
       MediaStreamDispatcher* media_stream_dispatcher,
       VideoCaptureImplManager* vc_manager,
       MediaStreamDependencyFactory* dependency_factory);
   virtual ~MediaStreamImpl();
 
-  // Stops a local MediaStream by notifying the MediaStreamDispatcher that the
-  // stream no longer may be used.
-  virtual void StopLocalMediaStream(
-      const WebKit::WebMediaStreamDescriptor& stream);
-
   // WebKit::WebUserMediaClient implementation
   virtual void requestUserMedia(
       const WebKit::WebUserMediaRequest& user_media_request,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources)
       OVERRIDE;
   virtual void cancelUserMediaRequest(
       const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
 
   // webkit_media::MediaStreamClient implementation.
@@ skipping 21 matching lines @@
   virtual void OnDeviceOpened(
       int request_id,
       const std::string& label,
       const media_stream::StreamDeviceInfo& device_info) OVERRIDE;
   virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
 
   // content::RenderViewObserver OVERRIDE
   virtual void FrameWillClose(WebKit::WebFrame* frame) OVERRIDE;
 
  protected:
+  // Stops a local MediaStream by notifying the MediaStreamDispatcher that the
+  // stream no longer may be used.
+  void OnLocalMediaStreamStop(const std::string& label);
   // This function is virtual for test purposes. A test can override this to
   // test requesting local media streams. The function notifies WebKit that the
   // |request| have completed and generated the MediaStream |stream|.
   virtual void CompleteGetUserMediaRequest(
       const WebKit::WebMediaStreamDescriptor& stream,
       WebKit::WebUserMediaRequest* request);
   // This function is virtual for test purposes.
   // Returns the WebKit representation of a MediaStream given an URL.
   virtual WebKit::WebMediaStreamDescriptor GetMediaStream(const GURL& url);
 
@@ skipping 32 matching lines @@
 
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   MediaRequestMap user_media_requests_;
   LocalNativeStreamMap local_media_streams_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_