[WebsiteSettings] Update permission bubble manager policy

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 "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.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"
@@ skipping 52 matching lines @@
       : ChromeRenderViewHostTestHarness(),
         request1_("test1"),
         request2_("test2") {}
   virtual ~PermissionBubbleManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     SetContents(CreateTestWebContents());
 
     manager_.reset(new PermissionBubbleManager(web_contents()));
-    manager_->SetCoalesceIntervalForTesting(0);
   }
 
   virtual void TearDown() OVERRIDE {
     manager_.reset();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   void ToggleAccept(int index, bool value) {
     manager_->ToggleAccept(index, value);
   }
 
   void Accept() {
     manager_->Accept();
   }
 
   void WaitForCoalescing() {
+    manager_->DocumentOnLoadCompletedInMainFrame(0);
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   virtual void NavigationEntryCommitted(
       const content::LoadCommittedDetails& details) {
     manager_->NavigationEntryCommitted(details);
   }
 
  protected:
   MockPermissionBubbleRequest request1_;
@@ skipping 130 matching lines @@
   manager_->AddRequest(&request1_);
   WaitForCoalescing();
   manager_->AddRequest(&request2_);
 
   EXPECT_TRUE(view_.shown_);
   ASSERT_EQ(1u, view_.permission_requests_.size());
   EXPECT_EQ(&request1_, view_.permission_requests_[0]);
 
   view_.Hide();
   Accept();
-  EXPECT_FALSE(view_.shown_);
+  WaitForCoalescing();
 
-  WaitForCoalescing();
   EXPECT_TRUE(view_.shown_);
   ASSERT_EQ(1u, view_.permission_requests_.size());
   EXPECT_EQ(&request2_, view_.permission_requests_[0]);
 }
 
 TEST_F(PermissionBubbleManagerTest, TestAddDuplicateRequest) {
   manager_->SetView(&view_);
   manager_->AddRequest(&request1_);
   manager_->AddRequest(&request2_);
   manager_->AddRequest(&request1_);
@@ skipping 66 matching lines @@
   NavigateAndCommit(GURL("http://www.google.com/"));
   manager_->SetView(&view_);
   manager_->AddRequest(&request1_);
   WaitForCoalescing();
   manager_->AddRequest(&request2_);
 
   EXPECT_TRUE(view_.shown_);
   ASSERT_EQ(1u, view_.permission_requests_.size());
 
   NavigateAndCommit(GURL("http://www2.google.com/"));
+  WaitForCoalescing();
 
-  EXPECT_FALSE(view_.shown_);
   EXPECT_TRUE(request1_.finished());
   EXPECT_TRUE(request2_.finished());
 }