Pull code associated with a Media PermissionRequest out of MediaStreamDevicesController

chrome/browser/permissions/permission_request_manager_browsertest.cc

 // Copyright 2015 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 "chrome/browser/permissions/permission_request_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
@@ skipping 13 matching lines @@
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace test {
 class MediaStreamDevicesControllerTestApi
-    : public internal::PermissionPromptDelegate {
+    : public MediaStreamDevicesController::PermissionPromptDelegate {
  public:
   static void AddRequestToManager(
       PermissionRequestManager* manager,
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) {
     MediaStreamDevicesControllerTestApi delegate(manager);
     MediaStreamDevicesController::RequestPermissionsWithDelegate(
         request, callback, &delegate);
   }
 
  private:
   // MediaStreamDevicesController::PermissionPromptDelegate:
   void ShowPrompt(
       bool user_gesture,
       content::WebContents* web_contents,
-      std::unique_ptr<MediaStreamDevicesController> controller) override {
-    manager_->AddRequest(controller.release());
+      std::unique_ptr<MediaStreamDevicesController::Request> request) override {
+    manager_->AddRequest(request.release());
   }
 
   explicit MediaStreamDevicesControllerTestApi(
       PermissionRequestManager* manager)
       : manager_(manager) {}
 
   PermissionRequestManager* manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesControllerTestApi);
 };
@@ skipping 433 matching lines @@
 #define MAYBE_InvokeDialog_protected_media InvokeDialog_protected_media
 #else
 #define MAYBE_InvokeDialog_protected_media DISABLED_InvokeDialog_protected_media
 #endif
 IN_PROC_BROWSER_TEST_F(PermissionDialogTest,
                        MAYBE_InvokeDialog_protected_media) {
   RunDialog();
 }
 
 }  // anonymous namespace