chrome/browser/captive_portal/captive_portal_service_unittest.cc - Issue 11413050: chrome/browser: Update calls from RunAllPending() to RunUntilIdle().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/captive_portal/captive_portal_service_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

« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover_unittest.cc ('k') | chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/captive_portal/captive_portal_service_unittest.cc

diff --git a/chrome/browser/captive_portal/captive_portal_service_unittest.cc b/chrome/browser/captive_portal/captive_portal_service_unittest.cc

index f039c7e10a083d3cdae16ee42f4d433ccec0c316..11a5921a70b0a5b1d9c84ed67920f4750ac2cd5c 100644

--- a/chrome/browser/captive_portal/captive_portal_service_unittest.cc

+++ b/chrome/browser/captive_portal/captive_portal_service_unittest.cc

@@ -170,7 +170,7 @@ class CaptivePortalServiceTest : public testing::Test,

EXPECT_FALSE(FetchingURL());

ASSERT_TRUE(TimerRunning());

- MessageLoop::current()->RunAllPending();

+ MessageLoop::current()->RunUntilIdle();

EXPECT_EQ(CaptivePortalService::STATE_CHECKING_FOR_PORTAL,

service()->state());

ASSERT_TRUE(FetchingURL());

@@ -218,7 +218,7 @@ class CaptivePortalServiceTest : public testing::Test,

EXPECT_FALSE(FetchingURL());

ASSERT_TRUE(TimerRunning());

- MessageLoop::current()->RunAllPending();

+ MessageLoop::current()->RunUntilIdle();

EXPECT_FALSE(FetchingURL());

EXPECT_FALSE(TimerRunning());

EXPECT_EQ(1, observer.num_results_received());

@@ -392,7 +392,7 @@ TEST_F(CaptivePortalServiceTest, CaptivePortalPrefDisabledWhileRunning) {

net::TestURLFetcherFactory factory;

service()->DetectCaptivePortal();

- MessageLoop::current()->RunAllPending();

+ MessageLoop::current()->RunUntilIdle();

EXPECT_TRUE(FetchingURL());

EXPECT_FALSE(TimerRunning());

@@ -401,7 +401,7 @@ TEST_F(CaptivePortalServiceTest, CaptivePortalPrefDisabledWhileRunning) {

EXPECT_TRUE(TimerRunning());

EXPECT_EQ(0, observer.num_results_received());

- MessageLoop::current()->RunAllPending();

+ MessageLoop::current()->RunUntilIdle();

EXPECT_FALSE(FetchingURL());

EXPECT_FALSE(TimerRunning());

@@ -429,7 +429,7 @@ TEST_F(CaptivePortalServiceTest, CaptivePortalPrefDisabledWhilePending) {

EXPECT_TRUE(TimerRunning());

EXPECT_EQ(0, observer.num_results_received());

- MessageLoop::current()->RunAllPending();

+ MessageLoop::current()->RunUntilIdle();

EXPECT_FALSE(FetchingURL());

EXPECT_FALSE(TimerRunning());

@@ -457,7 +457,7 @@ TEST_F(CaptivePortalServiceTest, CaptivePortalPrefEnabledWhilePending) {

EXPECT_FALSE(FetchingURL());

EXPECT_TRUE(TimerRunning());

- MessageLoop::current()->RunAllPending();

+ MessageLoop::current()->RunUntilIdle();

ASSERT_TRUE(FetchingURL());

EXPECT_FALSE(TimerRunning());