Use reference instead of pointer for media stream device request

content/browser/renderer_host/media/media_stream_device_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/media_stream_device_settings.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 94 matching lines @@
   DeviceMap devices_full;
   // Whether or not a task was posted to make the call to
   // RequestMediaAccessPermission, to make sure that we never post twice to it.
   bool posted_task;
 };
 
 namespace {
 
 // Sends the request to the appropriate WebContents.
 void DoDeviceRequest(
-    const MediaStreamDeviceSettingsRequest* request,
+    const MediaStreamDeviceSettingsRequest& request,
     const content::MediaResponseCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Send the permission request to the web contents.
   content::RenderViewHostImpl* host =
-      content::RenderViewHostImpl::FromID(request->render_process_id,
-                                          request->render_view_id);
+      content::RenderViewHostImpl::FromID(request.render_process_id,
+                                          request.render_view_id);
 
   // Tab may have gone away.
   if (!host || !host->GetDelegate()) {
     callback.Run(content::MediaStreamDevices());
     return;
   }
 
-  host->GetDelegate()->RequestMediaAccessPermission(request, callback);
+  host->GetDelegate()->RequestMediaAccessPermission(&request, callback);

[tommi (sloooow) - chröme, 2012/07/12 08:38:53]

Thanks for the quick fix - qq - should we also change
RequestMediaAccessPermission to take const& and not a pointer?  Just to reduce
the chance of implementors making incorrect assumptions?

 }
 
 }  // namespace
 
 MediaStreamDeviceSettings::MediaStreamDeviceSettings(
     SettingsRequester* requester)
     : requester_(requester),
       use_fake_ui_(false) {
   DCHECK(requester_);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 18 matching lines @@
   requests_.insert(std::make_pair(label, new MediaStreamDeviceSettingsRequest(
       render_process_id, render_view_id, security_origin, request_options)));
 }
 
 void MediaStreamDeviceSettings::RemovePendingCaptureRequest(
     const std::string& label) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   SettingsRequests::iterator request_it = requests_.find(label);
   if (request_it != requests_.end()) {
+    // Proceed the next pending request for the same page.
     MediaStreamDeviceSettingsRequest* request = request_it->second;
+    std::string new_label = FindReadyRequestForView(request->render_view_id,
+                                                    request->render_process_id);
+    if (!new_label.empty()) {
+      PostRequestToUi(new_label);
+    }
+
+    // TODO(xians): Post a cancel request on UI thread to dismiss the infobar
+    // if request has been sent to the UI.
+    // Remove the request from the queue.
     requests_.erase(request_it);
     delete request;
   }
 }
 
 void MediaStreamDeviceSettings::AvailableDevices(
     const std::string& label,
     MediaStreamType stream_type,
     const StreamDeviceInfoArray& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 65 matching lines @@
     }
   }
 }
 
 void MediaStreamDeviceSettings::PostResponse(
     const std::string& label,
     const content::MediaStreamDevices& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   SettingsRequests::iterator req = requests_.find(label);
+  // Return if the request has been removed.
+  if (req == requests_.end())
+    return;
+
   DCHECK(req != requests_.end()) << "Invalid request label.";
   DCHECK(requester_);
   MediaStreamDeviceSettingsRequest* request = req->second;
   requests_.erase(req);
 
   // Look for queued requests for the same view. If there is a pending request,
   // post it for user approval.
   std::string new_label = FindReadyRequestForView(request->render_view_id,
                                                   request->render_process_id);
   if (!new_label.empty()) {
@@ skipping 84 matching lines @@
   }
 
   scoped_refptr<ResponseCallbackHelper> helper =
       new ResponseCallbackHelper(AsWeakPtr());
   content::MediaResponseCallback callback =
       base::Bind(&ResponseCallbackHelper::PostResponse,
                  helper.get(), label);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&DoDeviceRequest, request, callback));
+      base::Bind(&DoDeviceRequest, *request, callback));
 }
 
 }  // namespace media_stream