Using WeakPtr for requests to MediaStreamDispatcher.

This is to ensure no dangling pointers to MediaStreamImpl (and other requesters). It's one of several fixes for the bug. No actual crash or issue has been reported that this CL fixes; it's for removing potential issues.

BUG=112408

Review URL: https://chromiumcodereview.appspot.com/9903014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131330 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h
index e712664..dcad0ee 100644
--- a/content/renderer/media/mock_media_stream_dispatcher.h
+++ b/content/renderer/media/mock_media_stream_dispatcher.h
@@ -15,10 +15,11 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {
   MockMediaStreamDispatcher();
   virtual ~MockMediaStreamDispatcher();
 
-  virtual void GenerateStream(int request_id,
-                              MediaStreamDispatcherEventHandler* event_handler,
-                              media_stream::StreamOptions components,
-                              const std::string& security_origin) OVERRIDE;
+  virtual void GenerateStream(
+      int request_id,
+      const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
+      media_stream::StreamOptions components,
+      const std::string& security_origin) OVERRIDE;
   virtual void StopStream(const std::string& label) OVERRIDE;
   virtual bool IsStream(const std::string& label) OVERRIDE;
   virtual int video_session_id(const std::string& label, int index) OVERRIDE;
@@ -34,7 +35,7 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {
 
  private:
   int request_id_;
-  MediaStreamDispatcherEventHandler* event_handler_;
+  base::WeakPtr<MediaStreamDispatcherEventHandler> event_handler_;
   media_stream::StreamOptions* components_;
   std::string security_origin_;
   int stop_stream_counter_;