Change MediaStreamDevicesController tests to use RequestPermissions function

chrome/browser/media/webrtc/media_stream_devices_controller.cc

Index: chrome/browser/media/webrtc/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.cc b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
index e085545aee5ca85bff824aaa2e20a09ac710f230..e2ad13c5b49108a2c94bf2c0fde4c6f28db35df2 100644
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
@@ -175,54 +175,42 @@ class MediaPermissionRequestLogger : content::WebContentsObserver {
 
 }  // namespace
 
-// static
-void MediaStreamDevicesController::RequestPermissions(
-    content::WebContents* web_contents,
-    const content::MediaStreamRequest& request,
-    const content::MediaResponseCallback& callback) {
-  std::unique_ptr<MediaStreamDevicesController> controller(
-      new MediaStreamDevicesController(web_contents, request, callback));
-  if (!controller->IsAskingForAudio() && !controller->IsAskingForVideo()) {
+// Implementation of PermissionPromptDelegate which actually shows a permission
+// prompt.
+class MediaStreamDevicesController::PermissionPromptDelegateImpl
+    : public MediaStreamDevicesController::PermissionPromptDelegate {
+ public:
+  void ShowPrompt(
+      bool user_gesture,
+      content::WebContents* web_contents,
+      std::unique_ptr<MediaStreamDevicesController> controller) override {
 #if defined(OS_ANDROID)
-    // If either audio or video was previously allowed and Chrome no longer has
-    // the necessary permissions, show a infobar to attempt to address this
-    // mismatch.
-    std::vector<ContentSettingsType> content_settings_types;
-    if (controller->IsAllowedForAudio())
-      content_settings_types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
-
-    if (controller->IsAllowedForVideo()) {
-      content_settings_types.push_back(
-          CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
-    }
-    if (!content_settings_types.empty() &&
-        PermissionUpdateInfoBarDelegate::ShouldShowPermissionInfobar(
-            web_contents, content_settings_types)) {
-      PermissionUpdateInfoBarDelegate::Create(
-          web_contents, content_settings_types,
-          base::Bind(&OnPermissionConflictResolved, base::Passed(&controller)));
+    PermissionUmaUtil::RecordPermissionPromptShown(
+        controller->GetPermissionRequestType(),
+        PermissionUtil::GetGestureType(user_gesture));
+    if (PermissionDialogDelegate::ShouldShowDialog(user_gesture)) {
+      PermissionDialogDelegate::CreateMediaStreamDialog(
+          web_contents, user_gesture, std::move(controller));
+    } else {
+      MediaStreamInfoBarDelegateAndroid::Create(web_contents, user_gesture,
+                                                std::move(controller));
     }
+#else
+    PermissionRequestManager* permission_request_manager =
+        PermissionRequestManager::FromWebContents(web_contents);
+    if (permission_request_manager)
+      permission_request_manager->AddRequest(controller.release());
 #endif
-    return;
   }
+};
 
-#if defined(OS_ANDROID)
-  PermissionUmaUtil::RecordPermissionPromptShown(
-      controller->GetPermissionRequestType(),
-      PermissionUtil::GetGestureType(request.user_gesture));
-  if (PermissionDialogDelegate::ShouldShowDialog(request.user_gesture)) {
-    PermissionDialogDelegate::CreateMediaStreamDialog(
-        web_contents, request.user_gesture, std::move(controller));
-  } else {
-    MediaStreamInfoBarDelegateAndroid::Create(
-        web_contents, request.user_gesture, std::move(controller));
-  }
-#else
-  PermissionRequestManager* permission_request_manager =
-      PermissionRequestManager::FromWebContents(web_contents);
-  if (permission_request_manager)
-    permission_request_manager->AddRequest(controller.release());
-#endif
+// static
+void MediaStreamDevicesController::RequestPermissions(
+    content::WebContents* web_contents,
+    const content::MediaStreamRequest& request,
+    const content::MediaResponseCallback& callback) {
+  PermissionPromptDelegateImpl delegate;
+  RequestPermissionsWithDelegate(web_contents, request, callback, &delegate);
 }
 
 // static
@@ -336,6 +324,42 @@ PermissionRequestType MediaStreamDevicesController::GetPermissionRequestType()
   return PermissionRequestType::MEDIA_STREAM;
 }
 
+// static
+void MediaStreamDevicesController::RequestPermissionsWithDelegate(
+    content::WebContents* web_contents,
+    const content::MediaStreamRequest& request,
+    const content::MediaResponseCallback& callback,
+    PermissionPromptDelegate* delegate) {
+  std::unique_ptr<MediaStreamDevicesController> controller(
+      new MediaStreamDevicesController(web_contents, request, callback));
+  if (!controller->IsAskingForAudio() && !controller->IsAskingForVideo()) {
+#if defined(OS_ANDROID)
+    // If either audio or video was previously allowed and Chrome no longer has
+    // the necessary permissions, show a infobar to attempt to address this
+    // mismatch.
+    std::vector<ContentSettingsType> content_settings_types;
+    if (controller->IsAllowedForAudio())
+      content_settings_types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
+
+    if (controller->IsAllowedForVideo()) {
+      content_settings_types.push_back(
+          CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+    }
+    if (!content_settings_types.empty() &&
+        PermissionUpdateInfoBarDelegate::ShouldShowPermissionInfobar(
+            web_contents, content_settings_types)) {
+      PermissionUpdateInfoBarDelegate::Create(
+          web_contents, content_settings_types,
+          base::Bind(&OnPermissionConflictResolved, base::Passed(&controller)));
+    }
+#endif
+    return;
+  }
+
+  delegate->ShowPrompt(request.user_gesture, web_contents,
+                       std::move(controller));
+}
+
 MediaStreamDevicesController::MediaStreamDevicesController(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,