Make sure DeviceRequestMessageFilter cancel all pending EnumerateDevices requests

content/browser/renderer_host/media/device_request_message_filter.cc

Index: content/browser/renderer_host/media/device_request_message_filter.cc
diff --git a/content/browser/renderer_host/media/device_request_message_filter.cc b/content/browser/renderer_host/media/device_request_message_filter.cc
index d5e36da5721d2c9f4172076ecc4aeb659e2ee4d3..37e3bea3c6530df6210d1e75cf2d091b252271d9 100644
--- a/content/browser/renderer_host/media/device_request_message_filter.cc
+++ b/content/browser/renderer_host/media/device_request_message_filter.cc
@@ -122,8 +122,11 @@ bool DeviceRequestMessageFilter::OnMessageReceived(const IPC::Message& message,
 
 void DeviceRequestMessageFilter::OnChannelClosing() {
   // Since the IPC channel is gone, cancel outstanding device requests.
-  media_stream_manager_->CancelAllRequests(peer_pid());
-
+  for (DeviceRequestList::iterator request_it = requests_.begin();
+       request_it != requests_.end(); ++request_it) {
+    media_stream_manager_->CancelRequest(request_it->audio_devices_label);
+    media_stream_manager_->CancelRequest(request_it->video_devices_label);
+  }
   requests_.clear();
 }