Pull code associated with a Media PermissionRequest out of MediaStreamDevicesController

chrome/browser/permissions/permission_dialog_delegate.cc

 // Copyright 2016 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_dialog_delegate.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
 #include "chrome/browser/media/midi_permission_infobar_delegate_android.h"
 #include "chrome/browser/media/protected_media_identifier_infobar_delegate_android.h"
-#include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
 #include "chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h"
 #include "chrome/browser/notifications/notification_permission_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_features.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/PermissionDialogController_jni.h"
 #include "jni/PermissionDialogDelegate_jni.h"
 #include "ui/android/window_android.h"
 #include "ui/base/window_open_disposition.h"
@@ skipping 27 matching lines @@
   // Dispatch the dialog to Java, which manages the lifetime of this object.
   new PermissionDialogDelegate(
       tab, PermissionInfoBarDelegate::CreateDelegate(
                type, requesting_frame, user_gesture, profile, callback));
 }
 
 // static
 void PermissionDialogDelegate::CreateMediaStreamDialog(
     content::WebContents* web_contents,
     bool user_gesture,
-    std::unique_ptr<MediaStreamDevicesController> controller) {
+    std::unique_ptr<MediaStreamDevicesController::Request> request) {
   DCHECK(web_contents);
 
   // If we don't have a tab, just act as though the prompt was dismissed.
   TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
   if (!tab) {
-    controller->Cancelled();
+    request->Cancelled();
     return;
   }
 
   // Called this way because the infobar delegate has a private destructor.
   std::unique_ptr<PermissionInfoBarDelegate> infobar_delegate;
   infobar_delegate.reset(new MediaStreamInfoBarDelegateAndroid(
       Profile::FromBrowserContext(web_contents->GetBrowserContext()),
-      user_gesture,
-      std::move(controller)));
+      user_gesture, std::move(request)));
 
   // Dispatch the dialog to Java, which manages the lifetime of this object.
   new PermissionDialogDelegate(tab, std::move(infobar_delegate));
 }
 
 // static
 bool PermissionDialogDelegate::ShouldShowDialog(bool has_user_gesture) {
   if (!base::FeatureList::IsEnabled(features::kModalPermissionPrompts))
     return false;
 
@@ skipping 82 matching lines @@
   base::android::ScopedJavaLocalRef<jobject> j_delegate =
       CreateJavaDelegate(env);
 
   // Send the Java delegate to the Java PermissionDialogController for display.
   // The controller takes over lifetime management; when the Java delegate is no
   // longer needed it will in turn free the native delegate.
   Java_PermissionDialogController_createDialog(env, j_delegate.obj());
 }
 
 PermissionDialogDelegate::~PermissionDialogDelegate() {}