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

Unified Diff: chrome/browser/safe_browsing/client_side_detection_host_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/client_side_detection_host_unittest.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index 5958f5e38f473cbcecfb1f66046069bf1fa44e29..17e82113959eeb9452345c746588466801419429 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -187,7 +187,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
}
static void RunAllPendingOnIO(base::WaitableEvent* event) {
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
event->Signal();
}
@@ -197,7 +197,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE,
csd_host_.release());
sb_service_ = NULL;
- message_loop_.RunAllPending();
+ message_loop_.RunUntilIdle();
ChromeRenderViewHostTestHarness::TearDown();
// Let the tasks on the IO thread run to avoid memory leaks.
@@ -206,7 +206,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
base::Bind(RunAllPendingOnIO, &done));
done.Wait();
io_thread_.reset();
- message_loop_.RunAllPending();
+ message_loop_.RunUntilIdle();
file_user_blocking_thread_.reset();
ui_thread_.reset();
}
@@ -262,7 +262,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
// Wait for CheckCsdWhitelist to be called if at all.
FlushIOMessageLoop();
// Checks for CheckCache() to be called if at all.
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
EXPECT_TRUE(Mock::VerifyAndClear(csd_service_.get()));
EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));
EXPECT_TRUE(Mock::VerifyAndClear(mock_profile_));
@@ -356,7 +356,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneNotPhishing) {
// Make sure DoDisplayBlockingPage is not going to be called.
EXPECT_CALL(*sb_service_, DoDisplayBlockingPage(_)).Times(0);
cb.Run(GURL(verdict.url()), false);
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));
}
@@ -388,7 +388,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneDisabled) {
// Make sure DoDisplayBlockingPage is not going to be called.
EXPECT_CALL(*sb_service_, DoDisplayBlockingPage(_)).Times(0);
cb.Run(GURL(verdict.url()), false);
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));
}
@@ -423,7 +423,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneShowInterstitial) {
.WillOnce(SaveArg<0>(&resource));
cb.Run(phishing_url, true);
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));
EXPECT_EQ(phishing_url, resource.url);
EXPECT_EQ(phishing_url, resource.original_url);
@@ -514,7 +514,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneMultiplePings) {
cb.Run(phishing_url, true); // Should have no effect.
cb_other.Run(other_phishing_url, true); // Should show interstitial.
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));
EXPECT_EQ(other_phishing_url, resource.url);
EXPECT_EQ(other_phishing_url, resource.original_url);
@@ -751,7 +751,7 @@ TEST_F(ClientSideDetectionHostTest, ShouldClassifyUrl) {
// Wait for CheckCsdWhitelist to be called on the IO thread.
FlushIOMessageLoop();
// Wait for CheckCache() to be called on the UI thread.
- MessageLoop::current()->RunAllPending();
+ MessageLoop::current()->RunUntilIdle();
// Now we check that all expected functions were indeed called on the two
// service objects.
EXPECT_TRUE(Mock::VerifyAndClear(csd_service_.get()));

Powered by Google App Engine
This is Rietveld 408576698