Only show grouped permission bubbles for mic/camera permissions

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 "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
@@ skipping 193 matching lines @@
   auto decided = [](bool, ContentSetting) {};
   auto cleanup = [] {};  // Leave cleanup to test harness destructor.
   owned_requests_.push_back(base::MakeUnique<PermissionRequestImpl>(
       GetUrl(), permission, browser()->profile(), user_gesture,
       base::Bind(decided), base::Bind(cleanup)));
   return owned_requests_.back().get();
 }
 
 void PermissionDialogTest::ShowDialog(const std::string& name) {
   constexpr const char* kMultipleName = "multiple";
-  // Permissions to request for a "multiple" request. Only types handled in
-  // PermissionRequestImpl::GetMessageTextFragment() are valid.
-  constexpr ContentSettingsType kMultipleRequests[] = {
-      CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-      CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
-  };
-  constexpr ContentSettingsType kMultipleRequestsWithMedia[] = {
-      CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-      CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
-      CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA};
   constexpr struct {
     const char* name;
     ContentSettingsType type;
   } kNameToType[] = {
       {"flash", CONTENT_SETTINGS_TYPE_PLUGINS},
       {"geolocation", CONTENT_SETTINGS_TYPE_GEOLOCATION},
       {"protected_media", CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER},
       {"notifications", CONTENT_SETTINGS_TYPE_NOTIFICATIONS},
       {"mic", CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC},
       {"camera", CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA},
@@ skipping 33 matching lines @@
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:  // Same as notifications.
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:  // ChromeOS only.
     case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
     case CONTENT_SETTINGS_TYPE_PLUGINS:  // Flash.
       manager->AddRequest(MakePermissionRequest(it->type));
       break;
     case CONTENT_SETTINGS_TYPE_DEFAULT:
+      // Permissions to request for a "multiple" request. Only mic/camera
+      // requests are grouped together.
       EXPECT_EQ(kMultipleName, name);
-      if (base::FeatureList::IsEnabled(
-              features::kUsePermissionManagerForMediaRequests)) {
-        for (auto request : kMultipleRequestsWithMedia)
-          manager->AddRequest(MakePermissionRequest(request));
-      } else {
-        for (auto request : kMultipleRequests)
-          manager->AddRequest(MakePermissionRequest(request));
-      }
+      manager->AddRequest(
+          MakePermissionRequest(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
+      manager->AddRequest(
+          MakePermissionRequest(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
 
       break;
     default:
       ADD_FAILURE() << "Not a permission type, or one that doesn't prompt.";
       return;
   }
   manager->DisplayPendingRequests();
 }
 
 // Requests before the load event should be bundled into one bubble.
@@ skipping 45 matching lines @@
       1);
   bubble_factory()->WaitForPermissionBubble();
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
   bubble_factory()->WaitForPermissionBubble();
 
   EXPECT_EQ(2, bubble_factory()->show_count());
-  EXPECT_EQ(4, bubble_factory()->TotalRequestCount());
+  EXPECT_EQ(2, bubble_factory()->TotalRequestCount());
 }
 
 // Navigating twice to the same URL with a hash should be navigation within the
 // page. This means the bubble is only shown once.
 // http://crbug.com/512849 flaky
 #if defined(OS_WIN)
 #define MAYBE_NavTwiceWithHash DISABLED_NavTwiceWithHash
 #else
 #define MAYBE_NavTwiceWithHash NavTwiceWithHash
 #endif
 IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
                        MAYBE_NavTwiceWithHash) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
   bubble_factory()->WaitForPermissionBubble();
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL(
           "/permissions/requests-before-load.html#0"),
       1);
   bubble_factory()->WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
-  EXPECT_EQ(2, bubble_factory()->TotalRequestCount());
+  EXPECT_EQ(1, bubble_factory()->TotalRequestCount());
 }
 
 // Bubble requests should be shown after in-page navigation.
 IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest, InPageNavigation) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/empty.html"),
       1);
@@ skipping 124 matching lines @@
 }
 
 // Host wants to use your MIDI devices.
 IN_PROC_BROWSER_TEST_F(PermissionDialogTest, InvokeDialog_midi) {
   RunDialog();
 }
 
 // Shows a permissions bubble with multiple requests.
 IN_PROC_BROWSER_TEST_F(PermissionDialogTest, InvokeDialog_multiple) {
   RunDialog();
-
-  {
-    base::test::ScopedFeatureList scoped_feature_list;
-    scoped_feature_list.InitAndEnableFeature(
-        features::kUsePermissionManagerForMediaRequests);
-    RunDialog();
-  }
 }
 
 // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER is ChromeOS only.
 #if defined(OS_CHROMEOS)
 #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