Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3043)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/permissions/permission_request_manager_unittest.cc

Issue 1686903002: [Abandoned] Rename PermissionBubbleManager to PermissionRequestManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests compile Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/permissions/permission_request_manager_browsertest.cc ('k') | chrome/browser/push_messaging/push_messaging_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_request_manager_unittest.cc
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc b/chrome/browser/permissions/permission_request_manager_unittest.cc
similarity index 85%
rename from chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
rename to chrome/browser/permissions/permission_request_manager_unittest.cc
index ae72ce6b551b84db1af3574e286e7ce27e6f2b35..a9235f50c5f681988941f1fe14de46ae630a5d9a 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
+++ b/chrome/browser/permissions/permission_request_manager_unittest.cc
@@ -10,15 +10,14 @@
#include "base/strings/utf_string_conversions.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_manager.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 PermissionBubbleManagerTest : public ChromeRenderViewHostTestHarness {
+class PermissionRequestManagerTest : public ChromeRenderViewHostTestHarness {
public:
- PermissionBubbleManagerTest()
+ PermissionRequestManagerTest()
: ChromeRenderViewHostTestHarness(),
request1_("test1"),
request2_("test2"),
@@ -26,14 +25,14 @@ class PermissionBubbleManagerTest : public ChromeRenderViewHostTestHarness {
GURL("http://www.google.com/some/url")),
iframe_request_other_domain_("iframe",
GURL("http://www.youtube.com")) {}
- ~PermissionBubbleManagerTest() override {}
+ ~PermissionRequestManagerTest() override {}
void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
SetContents(CreateTestWebContents());
NavigateAndCommit(GURL("http://www.google.com"));
- manager_.reset(new PermissionBubbleManager(web_contents()));
+ manager_.reset(new PermissionRequestManager(web_contents()));
view_factory_.reset(new MockPermissionBubbleFactory(false, manager_.get()));
}
@@ -56,7 +55,7 @@ class PermissionBubbleManagerTest : public ChromeRenderViewHostTestHarness {
}
void WaitForFrameLoad() {
- // PermissionBubbleManager ignores all parameters. Yay?
+ // PermissionRequestManager ignores all parameters. Yay?
manager_->DocumentLoadedInFrame(NULL);
base::MessageLoop::current()->RunUntilIdle();
}
@@ -80,11 +79,11 @@ class PermissionBubbleManagerTest : public ChromeRenderViewHostTestHarness {
MockPermissionBubbleRequest request2_;
MockPermissionBubbleRequest iframe_request_same_domain_;
MockPermissionBubbleRequest iframe_request_other_domain_;
- std::unique_ptr<PermissionBubbleManager> manager_;
+ std::unique_ptr<PermissionRequestManager> manager_;
std::unique_ptr<MockPermissionBubbleFactory> view_factory_;
};
-TEST_F(PermissionBubbleManagerTest, SingleRequest) {
+TEST_F(PermissionRequestManagerTest, SingleRequest) {
manager_->AddRequest(&request1_);
manager_->DisplayPendingRequests();
WaitForCoalescing();
@@ -97,7 +96,7 @@ TEST_F(PermissionBubbleManagerTest, SingleRequest) {
EXPECT_TRUE(request1_.granted());
}
-TEST_F(PermissionBubbleManagerTest, SingleRequestViewFirst) {
+TEST_F(PermissionRequestManagerTest, SingleRequestViewFirst) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -110,7 +109,7 @@ TEST_F(PermissionBubbleManagerTest, SingleRequestViewFirst) {
EXPECT_TRUE(request1_.granted());
}
-TEST_F(PermissionBubbleManagerTest, TwoRequests) {
+TEST_F(PermissionRequestManagerTest, TwoRequests) {
manager_->AddRequest(&request1_);
manager_->AddRequest(&request2_);
manager_->DisplayPendingRequests();
@@ -126,7 +125,7 @@ TEST_F(PermissionBubbleManagerTest, TwoRequests) {
EXPECT_FALSE(request2_.granted());
}
-TEST_F(PermissionBubbleManagerTest, TwoRequestsTabSwitch) {
+TEST_F(PermissionRequestManagerTest, TwoRequestsTabSwitch) {
manager_->AddRequest(&request1_);
manager_->AddRequest(&request2_);
manager_->DisplayPendingRequests();
@@ -151,20 +150,20 @@ TEST_F(PermissionBubbleManagerTest, TwoRequestsTabSwitch) {
EXPECT_FALSE(request2_.granted());
}
-TEST_F(PermissionBubbleManagerTest, NoRequests) {
+TEST_F(PermissionRequestManagerTest, NoRequests) {
manager_->DisplayPendingRequests();
WaitForCoalescing();
EXPECT_FALSE(view_factory_->is_visible());
}
-TEST_F(PermissionBubbleManagerTest, NoView) {
+TEST_F(PermissionRequestManagerTest, NoView) {
manager_->AddRequest(&request1_);
// Don't display the pending requests.
WaitForCoalescing();
EXPECT_FALSE(view_factory_->is_visible());
}
-TEST_F(PermissionBubbleManagerTest, TwoRequestsCoalesce) {
+TEST_F(PermissionRequestManagerTest, TwoRequestsCoalesce) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
manager_->AddRequest(&request2_);
@@ -175,7 +174,7 @@ TEST_F(PermissionBubbleManagerTest, TwoRequestsCoalesce) {
ASSERT_EQ(view_factory_->request_count(), 2);
}
-TEST_F(PermissionBubbleManagerTest, TwoRequestsDoNotCoalesce) {
+TEST_F(PermissionRequestManagerTest, TwoRequestsDoNotCoalesce) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -185,7 +184,7 @@ TEST_F(PermissionBubbleManagerTest, TwoRequestsDoNotCoalesce) {
ASSERT_EQ(view_factory_->request_count(), 1);
}
-TEST_F(PermissionBubbleManagerTest, TwoRequestsShownInTwoBubbles) {
+TEST_F(PermissionRequestManagerTest, TwoRequestsShownInTwoBubbles) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -202,7 +201,7 @@ TEST_F(PermissionBubbleManagerTest, TwoRequestsShownInTwoBubbles) {
ASSERT_EQ(view_factory_->show_count(), 2);
}
-TEST_F(PermissionBubbleManagerTest, TestAddDuplicateRequest) {
+TEST_F(PermissionRequestManagerTest, TestAddDuplicateRequest) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
manager_->AddRequest(&request2_);
@@ -213,7 +212,7 @@ TEST_F(PermissionBubbleManagerTest, TestAddDuplicateRequest) {
ASSERT_EQ(view_factory_->request_count(), 2);
}
-TEST_F(PermissionBubbleManagerTest, SequentialRequests) {
+TEST_F(PermissionRequestManagerTest, SequentialRequests) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -232,7 +231,7 @@ TEST_F(PermissionBubbleManagerTest, SequentialRequests) {
EXPECT_TRUE(request2_.granted());
}
-TEST_F(PermissionBubbleManagerTest, SameRequestRejected) {
+TEST_F(PermissionRequestManagerTest, SameRequestRejected) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
manager_->AddRequest(&request1_);
@@ -243,7 +242,7 @@ TEST_F(PermissionBubbleManagerTest, SameRequestRejected) {
ASSERT_EQ(view_factory_->request_count(), 1);
}
-TEST_F(PermissionBubbleManagerTest, DuplicateRequestCancelled) {
+TEST_F(PermissionRequestManagerTest, DuplicateRequestCancelled) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
MockPermissionBubbleRequest dupe_request("test1");
@@ -255,7 +254,7 @@ TEST_F(PermissionBubbleManagerTest, DuplicateRequestCancelled) {
EXPECT_TRUE(request1_.finished());
}
-TEST_F(PermissionBubbleManagerTest, DuplicateQueuedRequest) {
+TEST_F(PermissionRequestManagerTest, DuplicateQueuedRequest) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -280,7 +279,7 @@ TEST_F(PermissionBubbleManagerTest, DuplicateQueuedRequest) {
EXPECT_TRUE(request2_.finished());
}
-TEST_F(PermissionBubbleManagerTest, ForgetRequestsOnPageNavigation) {
+TEST_F(PermissionRequestManagerTest, ForgetRequestsOnPageNavigation) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -299,7 +298,7 @@ TEST_F(PermissionBubbleManagerTest, ForgetRequestsOnPageNavigation) {
EXPECT_TRUE(iframe_request_other_domain_.finished());
}
-TEST_F(PermissionBubbleManagerTest, TestCancelQueued) {
+TEST_F(PermissionRequestManagerTest, TestCancelQueued) {
manager_->AddRequest(&request1_);
EXPECT_FALSE(view_factory_->is_visible());
@@ -315,7 +314,7 @@ TEST_F(PermissionBubbleManagerTest, TestCancelQueued) {
ASSERT_EQ(view_factory_->request_count(), 1);
}
-TEST_F(PermissionBubbleManagerTest, TestCancelWhileDialogShown) {
+TEST_F(PermissionRequestManagerTest, TestCancelWhileDialogShown) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -329,7 +328,7 @@ TEST_F(PermissionBubbleManagerTest, TestCancelWhileDialogShown) {
EXPECT_FALSE(view_factory_->is_visible());
}
-TEST_F(PermissionBubbleManagerTest, TestCancelWhileDialogShownNoUpdate) {
+TEST_F(PermissionRequestManagerTest, TestCancelWhileDialogShownNoUpdate) {
manager_->DisplayPendingRequests();
view_factory_->SetCanUpdateUi(false);
manager_->AddRequest(&request1_);
@@ -344,7 +343,7 @@ TEST_F(PermissionBubbleManagerTest, TestCancelWhileDialogShownNoUpdate) {
Closing();
}
-TEST_F(PermissionBubbleManagerTest, TestCancelPendingRequest) {
+TEST_F(PermissionRequestManagerTest, TestCancelPendingRequest) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -359,7 +358,7 @@ TEST_F(PermissionBubbleManagerTest, TestCancelPendingRequest) {
EXPECT_TRUE(request2_.finished());
}
-TEST_F(PermissionBubbleManagerTest, MainFrameNoRequestIFrameRequest) {
+TEST_F(PermissionRequestManagerTest, MainFrameNoRequestIFrameRequest) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&iframe_request_same_domain_);
WaitForCoalescing();
@@ -370,7 +369,7 @@ TEST_F(PermissionBubbleManagerTest, MainFrameNoRequestIFrameRequest) {
EXPECT_TRUE(iframe_request_same_domain_.finished());
}
-TEST_F(PermissionBubbleManagerTest, MainFrameAndIFrameRequestSameDomain) {
+TEST_F(PermissionRequestManagerTest, MainFrameAndIFrameRequestSameDomain) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
manager_->AddRequest(&iframe_request_same_domain_);
@@ -385,7 +384,7 @@ TEST_F(PermissionBubbleManagerTest, MainFrameAndIFrameRequestSameDomain) {
EXPECT_FALSE(view_factory_->is_visible());
}
-TEST_F(PermissionBubbleManagerTest, MainFrameAndIFrameRequestOtherDomain) {
+TEST_F(PermissionRequestManagerTest, MainFrameAndIFrameRequestOtherDomain) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
manager_->AddRequest(&iframe_request_other_domain_);
@@ -401,7 +400,7 @@ TEST_F(PermissionBubbleManagerTest, MainFrameAndIFrameRequestOtherDomain) {
EXPECT_TRUE(iframe_request_other_domain_.finished());
}
-TEST_F(PermissionBubbleManagerTest, IFrameRequestWhenMainRequestVisible) {
+TEST_F(PermissionRequestManagerTest, IFrameRequestWhenMainRequestVisible) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
WaitForCoalescing();
@@ -419,7 +418,7 @@ TEST_F(PermissionBubbleManagerTest, IFrameRequestWhenMainRequestVisible) {
EXPECT_TRUE(iframe_request_same_domain_.finished());
}
-TEST_F(PermissionBubbleManagerTest,
+TEST_F(PermissionRequestManagerTest,
IFrameRequestOtherDomainWhenMainRequestVisible) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
@@ -436,7 +435,7 @@ TEST_F(PermissionBubbleManagerTest,
EXPECT_TRUE(iframe_request_other_domain_.finished());
}
-TEST_F(PermissionBubbleManagerTest, RequestsDontNeedUserGesture) {
+TEST_F(PermissionRequestManagerTest, RequestsDontNeedUserGesture) {
manager_->DisplayPendingRequests();
WaitForFrameLoad();
WaitForCoalescing();
« no previous file with comments | « chrome/browser/permissions/permission_request_manager_browsertest.cc ('k') | chrome/browser/push_messaging/push_messaging_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698