Refactor the content interface for RequestMediaAccessPermission.

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"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/media/media_stream_settings_requester.h"
+#include "content/browser/renderer_host/render_view_host_delegate.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/media_stream_request.h"
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
 using content::MediaStreamDevice;
 using content::MediaStreamRequest;
 
@@ skipping 76 matching lines @@
 
   // Request options.
   StreamOptions options;
   // Map containing available devices for the requested capture types.
   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 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);
+
+  // Tab may have gone away.
+  if (!host || !host->GetDelegate())
+    callback.Run(content::MediaStreamDevices());
+
+  host->GetDelegate()->RequestMediaAccessPermission(request, callback);
+}
+
+}  // namespace
+
 MediaStreamDeviceSettings::MediaStreamDeviceSettings(
     SettingsRequester* requester)
     : requester_(requester),
       use_fake_ui_(false) {
   DCHECK(requester_);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 MediaStreamDeviceSettings::~MediaStreamDeviceSettings() {
   STLDeleteValues(&requests_);
@@ skipping 196 matching lines @@
   for (DeviceMap::iterator it = request->devices_full.begin();
        it != request->devices_full.end(); ++it) {
     request->devices[it->first].clear();
     for (StreamDeviceInfoArray::iterator device = it->second.begin();
         device != it->second.end(); ++device) {
       request->devices[it->first].push_back(MediaStreamDevice(
           it->first, device->device_id, device->name));
     }
   }
 
-  // Send the permission request to the content client.
   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(
-          &content::ContentBrowserClient::RequestMediaAccessPermission,
-          base::Unretained(content::GetContentClient()->browser()),
-          request, callback));
-
+      base::Bind(&DoDeviceRequest, request, callback));
 }
 
 }  // namespace media_stream