Rename PermissionBubbleRequest to PermissionRequest

chrome/browser/permissions/permission_request_manager_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
+#include "chrome/browser/permissions/mock_permission_request.h"
+#include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h"
-#include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h"
-#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class PermissionRequestManagerTest : public ChromeRenderViewHostTestHarness {
  public:
   PermissionRequestManagerTest()
       : ChromeRenderViewHostTestHarness(),
-        request1_("test1", PermissionBubbleType::QUOTA),
-        request2_("test2", PermissionBubbleType::DOWNLOAD),
+        request1_("test1", PermissionRequestType::QUOTA),
+        request2_("test2", PermissionRequestType::DOWNLOAD),
         iframe_request_same_domain_("iframe",
                                     GURL("http://www.google.com/some/url")),
         iframe_request_other_domain_("iframe",
                                      GURL("http://www.youtube.com")) {}
   ~PermissionRequestManagerTest() override {}
 
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     SetContents(CreateTestWebContents());
     NavigateAndCommit(GURL("http://www.google.com"));
@@ skipping 38 matching lines @@
   void MockTabSwitchAway() { manager_->HideBubble(); }
 
   void MockTabSwitchBack() { manager_->DisplayPendingRequests(); }
 
   virtual void NavigationEntryCommitted(
       const content::LoadCommittedDetails& details) {
     manager_->NavigationEntryCommitted(details);
   }
 
  protected:
-  MockPermissionBubbleRequest request1_;
-  MockPermissionBubbleRequest request2_;
-  MockPermissionBubbleRequest iframe_request_same_domain_;
-  MockPermissionBubbleRequest iframe_request_other_domain_;
+  MockPermissionRequest request1_;
+  MockPermissionRequest request2_;
+  MockPermissionRequest iframe_request_same_domain_;
+  MockPermissionRequest iframe_request_other_domain_;
   std::unique_ptr<PermissionRequestManager> manager_;
   std::unique_ptr<MockPermissionBubbleFactory> view_factory_;
 };
 
 TEST_F(PermissionRequestManagerTest, SingleRequest) {
   manager_->AddRequest(&request1_);
   manager_->DisplayPendingRequests();
   WaitForCoalescing();
 
   EXPECT_TRUE(view_factory_->is_visible());
@@ skipping 146 matching lines @@
   EXPECT_FALSE(request1_.finished());
 
   WaitForCoalescing();
   EXPECT_TRUE(view_factory_->is_visible());
   ASSERT_EQ(view_factory_->request_count(), 1);
 }
 
 TEST_F(PermissionRequestManagerTest, DuplicateRequestCancelled) {
   manager_->DisplayPendingRequests();
   manager_->AddRequest(&request1_);
-  MockPermissionBubbleRequest dupe_request("test1");
+  MockPermissionRequest dupe_request("test1");
   manager_->AddRequest(&dupe_request);
   EXPECT_FALSE(dupe_request.finished());
   EXPECT_FALSE(request1_.finished());
   manager_->CancelRequest(&request1_);
   EXPECT_TRUE(dupe_request.finished());
   EXPECT_TRUE(request1_.finished());
 }
 
 TEST_F(PermissionRequestManagerTest, DuplicateQueuedRequest) {
   manager_->DisplayPendingRequests();
   manager_->AddRequest(&request1_);
   WaitForCoalescing();
   manager_->AddRequest(&request2_);
 
-  MockPermissionBubbleRequest dupe_request("test1");
+  MockPermissionRequest dupe_request("test1");
   manager_->AddRequest(&dupe_request);
   EXPECT_FALSE(dupe_request.finished());
   EXPECT_FALSE(request1_.finished());
 
-  MockPermissionBubbleRequest dupe_request2("test2");
+  MockPermissionRequest dupe_request2("test2");
   manager_->AddRequest(&dupe_request2);
   EXPECT_FALSE(dupe_request2.finished());
   EXPECT_FALSE(request2_.finished());
 
   manager_->CancelRequest(&request1_);
   EXPECT_TRUE(dupe_request.finished());
   EXPECT_TRUE(request1_.finished());
 
   manager_->CancelRequest(&request2_);
   EXPECT_TRUE(dupe_request2.finished());
@@ skipping 169 matching lines @@
 }
 
 TEST_F(PermissionRequestManagerTest, UMAForSimpleAcceptedBubble) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request1_);
   manager_->DisplayPendingRequests();
   WaitForCoalescing();
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptShown,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::QUOTA),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
       1);
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptRequestsPerPrompt, 1, 1);
 
   ToggleAccept(0, true);
   Accept();
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptAccepted,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::QUOTA), 1);
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
+      1);
 }
 
 TEST_F(PermissionRequestManagerTest, UMAForSimpleDeniedBubble) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request1_);
   manager_->DisplayPendingRequests();
   WaitForCoalescing();
   // No need to test UMA for showing prompts again, they were tested in
   // UMAForSimpleAcceptedBubble.
 
   Deny();
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptDenied,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::QUOTA), 1);
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
+      1);
 }
 
 // This code path (calling Accept on a non-merged bubble, with no accepted
 // permission) would never be used in actual Chrome, but its still tested for
 // completeness.
 TEST_F(PermissionRequestManagerTest, UMAForSimpleDeniedBubbleAlternatePath) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request1_);
   manager_->DisplayPendingRequests();
   WaitForCoalescing();
   // No need to test UMA for showing prompts again, they were tested in
   // UMAForSimpleAcceptedBubble.
 
   ToggleAccept(0, false);
   Accept();
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptDenied,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::QUOTA), 1);
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
+      1);
 }
 
 TEST_F(PermissionRequestManagerTest, UMAForMergedAcceptedBubble) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request1_);
   manager_->AddRequest(&request2_);
   manager_->DisplayPendingRequests();
   WaitForCoalescing();
 
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptShown,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::MULTIPLE),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::MULTIPLE),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleTypes,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::QUOTA),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleTypes,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::DOWNLOAD),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::DOWNLOAD),
       1);
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptRequestsPerPrompt, 2, 1);
 
   ToggleAccept(0, true);
   ToggleAccept(1, true);
   Accept();
 
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptAccepted,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::MULTIPLE),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::MULTIPLE),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleAccepted,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::QUOTA),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleAccepted,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::DOWNLOAD),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::DOWNLOAD),
       1);
 }
 
 TEST_F(PermissionRequestManagerTest, UMAForMergedMixedBubble) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request1_);
   manager_->AddRequest(&request2_);
   manager_->DisplayPendingRequests();
   WaitForCoalescing();
   // No need to test UMA for showing prompts again, they were tested in
   // UMAForMergedAcceptedBubble.
 
   ToggleAccept(0, true);
   ToggleAccept(1, false);
   Accept();
 
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptDenied,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::MULTIPLE),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::MULTIPLE),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleAccepted,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::QUOTA),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::DOWNLOAD),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::DOWNLOAD),
       1);
 }
 
 TEST_F(PermissionRequestManagerTest, UMAForMergedDeniedBubble) {
   base::HistogramTester histograms;
 
   manager_->AddRequest(&request1_);
   manager_->AddRequest(&request2_);
   manager_->DisplayPendingRequests();
   WaitForCoalescing();
   // No need to test UMA for showing prompts again, they were tested in
   // UMAForMergedAcceptedBubble.
 
   ToggleAccept(0, false);
   ToggleAccept(1, false);
   Accept();
 
   histograms.ExpectUniqueSample(
       PermissionUmaUtil::kPermissionsPromptDenied,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::MULTIPLE),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::MULTIPLE),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::QUOTA),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA),
       1);
   histograms.ExpectBucketCount(
       PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied,
-      static_cast<base::HistogramBase::Sample>(PermissionBubbleType::DOWNLOAD),
+      static_cast<base::HistogramBase::Sample>(PermissionRequestType::DOWNLOAD),
       1);
 }