Only enable kUsePermissionManagerForMediaRequests when the PermissionRequestManager is used

This adds a check which ensures that the PermissionManager is used to
request permission for Media requests only when the
PermissionRequestManager is enabled. If it's not enabled, the grouped
request won't work correctly.

BUG=596786

Review-Url: https://codereview.chromium.org/2941943002
Cr-Commit-Position: refs/heads/master@{#480017}

chrome/browser/media/webrtc/media_stream_devices_controller.cc

@@ -19,6 +19,7 @@
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 #include "chrome/browser/media/webrtc/media_stream_device_permissions.h"
 #include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
@@ -53,7 +54,6 @@
 #include "content/public/browser/android/content_view_core.h"
 #include "ui/android/window_android.h"
 #else  // !defined(OS_ANDROID)
-#include "chrome/browser/permissions/permission_request_manager.h"
 #include "ui/vector_icons/vector_icons.h"
 #endif
 
@@ -465,7 +465,8 @@ void MediaStreamDevicesController::RequestPermissionsWithDelegate(
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
     if (base::FeatureList::IsEnabled(
-            features::kUsePermissionManagerForMediaRequests)) {
+            features::kUsePermissionManagerForMediaRequests) &&
+        PermissionRequestManager::IsEnabled()) {
       std::vector<ContentSettingsType> content_settings_types;
 
       if (is_asking_for_audio)