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

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

Issue 260373002: Revert of [WebsiteSettings] Update permission bubble manager policy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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/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 b7bb2cd505c5346efcfcba7283a22093aff9ab13..bda0202b92ba6454b4374d92b1dc181362f338ed 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
@@ -70,6 +70,7 @@
SetContents(CreateTestWebContents());
manager_.reset(new PermissionBubbleManager(web_contents()));
+ manager_->SetCoalesceIntervalForTesting(0);
}
virtual void TearDown() OVERRIDE {
@@ -86,7 +87,6 @@
}
void WaitForCoalescing() {
- manager_->DocumentOnLoadCompletedInMainFrame(0);
base::MessageLoop::current()->RunUntilIdle();
}
@@ -237,8 +237,9 @@
view_.Hide();
Accept();
- WaitForCoalescing();
-
+ EXPECT_FALSE(view_.shown_);
+
+ WaitForCoalescing();
EXPECT_TRUE(view_.shown_);
ASSERT_EQ(1u, view_.permission_requests_.size());
EXPECT_EQ(&request2_, view_.permission_requests_[0]);
@@ -325,8 +326,8 @@
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());
}
« 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