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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

Issue 11413050: chrome/browser: Update calls from RunAllPending() to RunUntilIdle(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
index da7af73bf99ae1b4b2d225ea6ad77929c8edcc27..cbb29a7ea9de76c282f33f2ad2bb9e24b409fed4 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
@@ -187,14 +187,14 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness {
SafeBrowsingBlockingPage* sb_interstitial) {
sb_interstitial->interstitial_page_->Proceed();
// Proceed() posts a task to update the SafeBrowsingService::Client.
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
}
static void DontProceedThroughInterstitial(
SafeBrowsingBlockingPage* sb_interstitial) {
sb_interstitial->interstitial_page_->DontProceed();
// DontProceed() posts a task to update the SafeBrowsingService::Client.
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
}
void DontProceedThroughSubresourceInterstitial(
@@ -203,7 +203,7 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness {
// subresource interstitials.
GoBack(false);
// DontProceed() posts a task to update the SafeBrowsingService::Client.
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
}
scoped_refptr<TestSafeBrowsingService> service_;
@@ -248,7 +248,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwarePageDontProceed) {
SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
ASSERT_TRUE(sb_interstitial);
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
// Simulate the user clicking "don't proceed".
DontProceedThroughInterstitial(sb_interstitial);
@@ -577,7 +577,7 @@ TEST_F(SafeBrowsingBlockingPageTest, ProceedThenDontProceed) {
SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
ASSERT_TRUE(sb_interstitial);
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
// Simulate the user clicking "proceed" then "don't proceed" (before the
// interstitial is shown).
@@ -585,7 +585,7 @@ TEST_F(SafeBrowsingBlockingPageTest, ProceedThenDontProceed) {
sb_interstitial->interstitial_page_->DontProceed();
// Proceed() and DontProceed() post a task to update the
// SafeBrowsingService::Client.
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
// The interstitial should be gone.
EXPECT_EQ(OK, user_response());
@@ -612,7 +612,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReportsDisabled) {
SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
ASSERT_TRUE(sb_interstitial);
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
// Simulate the user clicking "don't proceed".
DontProceedThroughInterstitial(sb_interstitial);
@@ -645,7 +645,7 @@ TEST_F(SafeBrowsingBlockingPageTest, MalwareReports) {
SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
ASSERT_TRUE(sb_interstitial);
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
EXPECT_FALSE(profile->GetPrefs()->GetBoolean(
prefs::kSafeBrowsingReportingEnabled));

Powered by Google App Engine
This is Rietveld 408576698