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

Unified Diff: chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc

Issue 1610753002: Fixes Permission Bubbles never responding to duplicate requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests and RequestFinishedIncludingDuplicates DCHECK Created 4 years, 11 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/ui/website_settings/permission_bubble_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
index a5dd1c1e19794c6af280034fff7f0f9dc102cb6e..4d5305060c1029e57f81c397e9a362af62c572d4 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
@@ -302,13 +302,16 @@ TEST_F(PermissionBubbleManagerTest, SameRequestRejected) {
EXPECT_EQ(&request1_, view_()->permission_requests_[0]);
}
-TEST_F(PermissionBubbleManagerTest, DuplicateRequestRejected) {
+TEST_F(PermissionBubbleManagerTest, DuplicateRequestCancelled) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
MockPermissionBubbleRequest dupe_request("test1");
manager_->AddRequest(&dupe_request);
- EXPECT_TRUE(dupe_request.finished());
+ EXPECT_FALSE(dupe_request.finished());
EXPECT_FALSE(request1_.finished());
+ manager_->CancelRequest(&request1_);
+ EXPECT_TRUE(dupe_request.finished());
+ EXPECT_TRUE(request1_.finished());
}
TEST_F(PermissionBubbleManagerTest, DuplicateQueuedRequest) {
@@ -319,13 +322,21 @@ TEST_F(PermissionBubbleManagerTest, DuplicateQueuedRequest) {
MockPermissionBubbleRequest dupe_request("test1");
manager_->AddRequest(&dupe_request);
- EXPECT_TRUE(dupe_request.finished());
+ EXPECT_FALSE(dupe_request.finished());
EXPECT_FALSE(request1_.finished());
- MockPermissionBubbleRequest dupe_request2("test1");
+ MockPermissionBubbleRequest dupe_request2("test2");
manager_->AddRequest(&dupe_request2);
- EXPECT_TRUE(dupe_request2.finished());
+ 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());
+ EXPECT_TRUE(request2_.finished());
}
TEST_F(PermissionBubbleManagerTest, ForgetRequestsOnPageNavigation) {
« no previous file with comments | « chrome/browser/ui/website_settings/permission_bubble_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698