Using WeakPtr for requests to MediaStreamDispatcher.

content/renderer/media/media_stream_dispatcher.cc

Index: content/renderer/media/media_stream_dispatcher.cc
diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc
index 254740a6c31ee0013f48993d2ffe18230d08c7ff..cdf1d02b12661cb34e19ccf8e0fa5c2125ac6fb2 100644
--- a/content/renderer/media/media_stream_dispatcher.cc
+++ b/content/renderer/media/media_stream_dispatcher.cc
@@ -10,22 +10,22 @@
 #include "content/renderer/render_view_impl.h"
 
 struct MediaStreamDispatcher::Request {
-  Request(MediaStreamDispatcherEventHandler* handler,
+  Request(const base::WeakPtr<MediaStreamDispatcherEventHandler>& handler,
           int request_id,
           int ipc_request)
       : handler(handler),
         request_id(request_id),
         ipc_request(ipc_request) {
   }
-  MediaStreamDispatcherEventHandler* handler;
+  base::WeakPtr<MediaStreamDispatcherEventHandler> handler;
   int request_id;
   int ipc_request;
 };
 
 struct MediaStreamDispatcher::Stream {
-  Stream() : handler(NULL) {}
+  Stream() {}
   ~Stream() {}
-  MediaStreamDispatcherEventHandler* handler;
+  base::WeakPtr<MediaStreamDispatcherEventHandler> handler;
   media_stream::StreamDeviceInfoArray audio_array;
   media_stream::StreamDeviceInfoArray video_array;
 };
@@ -39,7 +39,7 @@ MediaStreamDispatcher::~MediaStreamDispatcher() {}
 
 void MediaStreamDispatcher::GenerateStream(
     int request_id,
-    MediaStreamDispatcherEventHandler* event_handler,
+    const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
     media_stream::StreamOptions components,
     const std::string& security_origin) {
   DVLOG(1) << "MediaStreamDispatcher::GenerateStream(" << request_id << ")";
@@ -65,7 +65,7 @@ void MediaStreamDispatcher::StopStream(const std::string& label) {
 
 void MediaStreamDispatcher::EnumerateDevices(
     int request_id,
-    MediaStreamDispatcherEventHandler* event_handler,
+    const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
     media_stream::MediaStreamType type,
     const std::string& security_origin) {
   DVLOG(1) << "MediaStreamDispatcher::EnumerateDevices("
@@ -80,7 +80,7 @@ void MediaStreamDispatcher::EnumerateDevices(
 
 void MediaStreamDispatcher::OpenDevice(
     int request_id,
-    MediaStreamDispatcherEventHandler* event_handler,
+    const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
     const std::string& device_id,
     media_stream::MediaStreamType type,
     const std::string& security_origin) {
@@ -140,10 +140,12 @@ void MediaStreamDispatcher::OnStreamGenerated(
       new_stream.audio_array = audio_array;
       new_stream.video_array = video_array;
       label_stream_map_[label] = new_stream;
-      request.handler->OnStreamGenerated(request.request_id, label,
-                                         audio_array, video_array);
-      DVLOG(1) << "MediaStreamDispatcher::OnStreamGenerated("
-               << request.request_id << ", " << label << ")";
+      if (request.handler) {
+        request.handler->OnStreamGenerated(request.request_id, label,
+                                           audio_array, video_array);
+        DVLOG(1) << "MediaStreamDispatcher::OnStreamGenerated("
+                 << request.request_id << ", " << label << ")";
+      }
       requests_.erase(it);
       break;
     }
@@ -155,9 +157,11 @@ void MediaStreamDispatcher::OnStreamGenerationFailed(int request_id) {
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
-      request.handler->OnStreamGenerationFailed(request.request_id);
-      DVLOG(1) << "MediaStreamDispatcher::OnStreamGenerationFailed("
-               << request.request_id << ")\n";
+      if (request.handler) {
+        request.handler->OnStreamGenerationFailed(request.request_id);
+        DVLOG(1) << "MediaStreamDispatcher::OnStreamGenerationFailed("
+                 << request.request_id << ")\n";
+      }
       requests_.erase(it);
       break;
     }
@@ -175,7 +179,8 @@ void MediaStreamDispatcher::OnVideoDeviceFailed(const std::string& label,
   media_stream::StreamDeviceInfoArray::iterator device_it =
       it->second.video_array.begin();
   it->second.video_array.erase(device_it + index);
-  it->second.handler->OnVideoDeviceFailed(label, index);
+  if (it->second.handler)
+    it->second.handler->OnVideoDeviceFailed(label, index);
 }
 
 void MediaStreamDispatcher::OnAudioDeviceFailed(const std::string& label,
@@ -189,7 +194,8 @@ void MediaStreamDispatcher::OnAudioDeviceFailed(const std::string& label,
   media_stream::StreamDeviceInfoArray::iterator device_it =
       it->second.audio_array.begin();
   it->second.audio_array.erase(device_it + index);
-  it->second.handler->OnAudioDeviceFailed(label, index);
+  if (it->second.handler)
+    it->second.handler->OnAudioDeviceFailed(label, index);
 }
 
 void MediaStreamDispatcher::OnDevicesEnumerated(
@@ -200,9 +206,11 @@ void MediaStreamDispatcher::OnDevicesEnumerated(
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
-      request.handler->OnDevicesEnumerated(request.request_id, device_array);
-      DVLOG(1) << "MediaStreamDispatcher::OnDevicesEnumerated("
-               << request.request_id << ")";
+      if (request.handler) {
+        request.handler->OnDevicesEnumerated(request.request_id, device_array);
+        DVLOG(1) << "MediaStreamDispatcher::OnDevicesEnumerated("
+                 << request.request_id << ")";
+      }
       requests_.erase(it);
       break;
     }
@@ -214,9 +222,11 @@ void MediaStreamDispatcher::OnDevicesEnumerationFailed(int request_id) {
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
-      request.handler->OnStreamGenerationFailed(request.request_id);
-      DVLOG(1) << "MediaStreamDispatcher::OnDevicesEnumerationFailed("
-               << request.request_id << ")\n";
+      if (request.handler) {
+        request.handler->OnStreamGenerationFailed(request.request_id);
+        DVLOG(1) << "MediaStreamDispatcher::OnDevicesEnumerationFailed("
+                 << request.request_id << ")\n";
+      }
       requests_.erase(it);
       break;
     }
@@ -240,10 +250,12 @@ void MediaStreamDispatcher::OnDeviceOpened(
         new_stream.audio_array.push_back(device_info);
       }
       label_stream_map_[label] = new_stream;
-      request.handler->OnDeviceOpened(request.request_id, label,
-                                      device_info);
-      DVLOG(1) << "MediaStreamDispatcher::OnDeviceOpened("
-               << request.request_id << ", " << label << ")";
+      if (request.handler) {
+        request.handler->OnDeviceOpened(request.request_id, label,
+                                        device_info);
+        DVLOG(1) << "MediaStreamDispatcher::OnDeviceOpened("
+                 << request.request_id << ", " << label << ")";
+      }
       requests_.erase(it);
       break;
     }
@@ -255,9 +267,11 @@ void MediaStreamDispatcher::OnDeviceOpenFailed(int request_id) {
        it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.ipc_request == request_id) {
-      request.handler->OnDeviceOpenFailed(request.request_id);
-      DVLOG(1) << "MediaStreamDispatcher::OnDeviceOpenFailed("
-               << request.request_id << ")\n";
+      if (request.handler) {
+        request.handler->OnDeviceOpenFailed(request.request_id);
+        DVLOG(1) << "MediaStreamDispatcher::OnDeviceOpenFailed("
+                 << request.request_id << ")\n";
+      }
       requests_.erase(it);
       break;
     }