[Abandoned] Rename PermissionBubbleManager to PermissionRequestManager.

chrome/browser/permissions/permission_request_manager_browsertest.cc

Index: chrome/browser/permissions/permission_request_manager_browsertest.cc
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc b/chrome/browser/permissions/permission_request_manager_browsertest.cc
similarity index 87%
rename from chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc
rename to chrome/browser/permissions/permission_request_manager_browsertest.cc
index 9e2436c1e692bd70f6df0389901cd662381d7701..731afb69337428d47803a3eab24b54669ce221be 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc
+++ b/chrome/browser/permissions/permission_request_manager_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
+#include "chrome/browser/permissions/permission_request_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ -28,14 +28,14 @@ const char* kPermissionsKillSwitchBlockedValue =
     PermissionContextBase::kPermissionsKillSwitchBlockedValue;
 const char kPermissionsKillSwitchTestGroup[] = "TestGroup";
 
-class PermissionBubbleManagerBrowserTest : public InProcessBrowserTest {
+class PermissionRequestManagerBrowserTest : public InProcessBrowserTest {
  public:
-  PermissionBubbleManagerBrowserTest() = default;
-  ~PermissionBubbleManagerBrowserTest() override = default;
+  PermissionRequestManagerBrowserTest() = default;
+  ~PermissionRequestManagerBrowserTest() override = default;
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
-    PermissionBubbleManager* manager = GetPermissionBubbleManager();
+    PermissionRequestManager* manager = GetPermissionRequestManager();
     mock_permission_bubble_factory_.reset(
         new MockPermissionBubbleFactory(true, manager));
     manager->DisplayPendingRequests();
@@ -46,12 +46,12 @@ class PermissionBubbleManagerBrowserTest : public InProcessBrowserTest {
     InProcessBrowserTest::TearDownOnMainThread();
   }
 
-  PermissionBubbleManager* GetPermissionBubbleManager() {
-    return PermissionBubbleManager::FromWebContents(
+  PermissionRequestManager* GetPermissionRequestManager() {
+    return PermissionRequestManager::FromWebContents(
         browser()->tab_strip_model()->GetActiveWebContents());
   }
 
-  void WaitForPermissionBubble() {
+  void WaitForPermissionRequest() {
     if (bubble_factory()->is_visible())
       return;
     content::RunMessageLoop();
@@ -78,7 +78,7 @@ class PermissionBubbleManagerBrowserTest : public InProcessBrowserTest {
 
 // Requests before the load event should be bundled into one bubble.
 // http://crbug.com/512849 flaky
-IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
+IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
                        DISABLED_RequestsBeforeLoad) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
@@ -86,14 +86,14 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
   EXPECT_EQ(2, bubble_factory()->total_request_count());
 }
 
 // Requests before the load should not be bundled with a request after the load.
-IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
+IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
                        RequestsBeforeAfterLoad) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
@@ -102,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
       embedded_test_server()->GetURL(
           "/permissions/requests-before-after-load.html"),
       1);
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
   EXPECT_EQ(1, bubble_factory()->total_request_count());
@@ -116,20 +116,20 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
 #else
 #define MAYBE_NavTwice NavTwice
 #endif
-IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_NavTwice) {
+IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest, MAYBE_NavTwice) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
 
   EXPECT_EQ(2, bubble_factory()->show_count());
   EXPECT_EQ(4, bubble_factory()->total_request_count());
@@ -143,7 +143,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_NavTwice) {
 #else
 #define MAYBE_NavTwiceWithHash NavTwiceWithHash
 #endif
-IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
+IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
                        MAYBE_NavTwiceWithHash) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
@@ -151,21 +151,21 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
       browser(),
       embedded_test_server()->GetURL("/permissions/requests-before-load.html"),
       1);
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(),
       embedded_test_server()->GetURL(
           "/permissions/requests-before-load.html#0"),
       1);
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
   EXPECT_EQ(2, bubble_factory()->total_request_count());
 }
 
 // Bubble requests should be shown after in-page navigation.
-IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, InPageNavigation) {
+IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest, InPageNavigation) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
@@ -182,14 +182,14 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, InPageNavigation) {
   ExecuteScriptAndGetValue(
       browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame(),
       "navigator.geolocation.getCurrentPosition(function(){});");
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
   EXPECT_EQ(1, bubble_factory()->total_request_count());
 }
 
 // Bubble requests should not be shown when the killswitch is on.
-IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
+IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
                        KillSwitchGeolocation) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
@@ -219,13 +219,13 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
       embedded_test_server()->GetURL("/permissions/killswitch_tester.html"));
 
   EXPECT_TRUE(content::ExecuteScript(web_contents, "requestGeolocation();"));
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
   EXPECT_EQ(1, bubble_factory()->show_count());
   EXPECT_EQ(1, bubble_factory()->total_request_count());
 }
 
 // Bubble requests should not be shown when the killswitch is on.
-IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
+IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
                        KillSwitchNotifications) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
@@ -249,7 +249,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,
   variations::testing::ClearAllVariationParams();
 
   EXPECT_TRUE(content::ExecuteScript(web_contents, "requestNotification();"));
-  WaitForPermissionBubble();
+  WaitForPermissionRequest();
   EXPECT_EQ(1, bubble_factory()->show_count());
   EXPECT_EQ(1, bubble_factory()->total_request_count());
 }