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..b6c2f87f1329e7f5c7a0407c28921eb60fafbabe 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,17 +19,27 @@ class LocalMediaStreamInterface;
 class CONTENT_EXPORT MediaStreamExtraData
     : NON_EXPORTED_BASE(public WebKit::WebMediaStreamDescriptor::ExtraData) {
  public:
+  typedef base::Callback<void(const WebKit::WebMediaStreamDescriptor&)>
+      StreamStopCallback;
+
   explicit MediaStreamExtraData(webrtc::MediaStreamInterface* remote_stream);
   explicit MediaStreamExtraData(
       webrtc::LocalMediaStreamInterface* local_stream);
   virtual ~MediaStreamExtraData();
 
+  void SetLocalStreamStopCallback(
+      const StreamStopCallback& stop_callback);
+  const StreamStopCallback& stream_stop_callback() {

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

Sorry, but this is more confusing.
Let's go back to the other approach you had but instead of naming the function
RunLocalStreamStopCallback, call it something that indicates that an event has
occurred like OnLocalStreamStopped().
The difference is that the getter approach and the 'Run' method, both expose an
implementation detail of this class.  An event on the other hand does not
promise anything about how the event will be handled so the implementation is
opaque as far as the caller is concerned.

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

Done.

+    return stream_stop_callback_;
+  }
+
   webrtc::MediaStreamInterface* remote_stream() { return remote_stream_.get(); }
   webrtc::LocalMediaStreamInterface* local_stream() {
     return local_stream_.get();
   }
 
  private:
+  StreamStopCallback stream_stop_callback_;
   scoped_refptr<webrtc::MediaStreamInterface> remote_stream_;
   scoped_refptr<webrtc::LocalMediaStreamInterface> local_stream_;