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

content/renderer/media/media_stream_extra_data.h

Index: content/renderer/media/media_stream_extra_data.h
diff --git a/content/renderer/media/media_stream_extra_data.h b/content/renderer/media/media_stream_extra_data.h
index c838371fad3b415dcd85aed04d0af9d838fce9eb..e5c45cbe84b9b1a849e960d2b16e98ab070f6ae6 100644
--- a/content/renderer/media/media_stream_extra_data.h
+++ b/content/renderer/media/media_stream_extra_data.h
@@ -5,6 +5,7 @@
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
@@ -18,9 +19,13 @@ class LocalMediaStreamInterface;
 class CONTENT_EXPORT MediaStreamExtraData
     : NON_EXPORTED_BASE(public WebKit::WebMediaStreamDescriptor::ExtraData) {
  public:
+  typedef base::Callback<void(const std::string& label)> StreamStopCallback;
+
   explicit MediaStreamExtraData(webrtc::MediaStreamInterface* remote_stream);
   explicit MediaStreamExtraData(
       webrtc::LocalMediaStreamInterface* local_stream);
+  void SetLocalStreamStopCallback(
+      const StreamStopCallback& stop_callback);
   virtual ~MediaStreamExtraData();
 
   webrtc::MediaStreamInterface* remote_stream() { return remote_stream_.get(); }
@@ -28,7 +33,10 @@ class CONTENT_EXPORT MediaStreamExtraData
     return local_stream_.get();
   }
 
+  void RunStreamStopCallback();

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

should this be public?

If it does, then it feels to me that the callback is being stored in the wrong
place.  Can it instead be stored with the class that needs to call
RunStreamStopCallback?

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

ok- changed this into a just passing around data. 
On 2012/09/21 09:18:03, tommi wrote:

+
  private:
+  StreamStopCallback stream_stop_callback_;
   scoped_refptr<webrtc::MediaStreamInterface> remote_stream_;
   scoped_refptr<webrtc::LocalMediaStreamInterface> local_stream_;