Fixes Permission Bubbles never responding to duplicate requests

chrome/browser/ui/website_settings/permission_bubble_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/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 284 matching lines @@
   manager_->AddRequest(&request1_);
   manager_->AddRequest(&request1_);
   EXPECT_FALSE(request1_.finished());
 
   WaitForCoalescing();
   EXPECT_TRUE(view_()->shown_);
   ASSERT_EQ(1u, view_()->permission_requests_.size());
   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_FALSE(dupe_request.finished());
+  EXPECT_FALSE(request1_.finished());
+  manager_->CancelRequest(&request1_);
   EXPECT_TRUE(dupe_request.finished());
-  EXPECT_FALSE(request1_.finished());
+  EXPECT_TRUE(request1_.finished());
 }
 
 TEST_F(PermissionBubbleManagerTest, DuplicateQueuedRequest) {
   manager_->DisplayPendingRequests();
   manager_->AddRequest(&request1_);
   WaitForCoalescing();
   manager_->AddRequest(&request2_);
 
   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_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_FALSE(request2_.finished());
+  EXPECT_TRUE(request2_.finished());
 }
 
 TEST_F(PermissionBubbleManagerTest, ForgetRequestsOnPageNavigation) {
   manager_->DisplayPendingRequests();
   manager_->AddRequest(&request1_);
   WaitForCoalescing();
   manager_->AddRequest(&request2_);
   manager_->AddRequest(&iframe_request_other_domain_);
 
   EXPECT_TRUE(view_()->shown_);
@@ skipping 187 matching lines @@
   manager_->DisplayPendingRequests();
   WaitForFrameLoad();
   WaitForCoalescing();
   manager_->AddRequest(&request1_);
   manager_->AddRequest(&iframe_request_other_domain_);
   manager_->AddRequest(&request2_);
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_TRUE(view_()->shown_);
 }