Index: webkit/appcache/appcache_service_unittest.cc |
diff --git a/webkit/appcache/appcache_service_unittest.cc b/webkit/appcache/appcache_service_unittest.cc |
index 4a78396a4adddeac429274cb124b989305ca59db..37b334a8a2a0972283a4a7182567554c89f55cf6 100644 |
--- a/webkit/appcache/appcache_service_unittest.cc |
+++ b/webkit/appcache/appcache_service_unittest.cc |
@@ -184,7 +184,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) { |
// Without giving mock storage simiulated info, should fail. |
service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_); |
EXPECT_EQ(0, delete_completion_count_); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(1, delete_completion_count_); |
EXPECT_EQ(net::ERR_FAILED, delete_result_); |
delete_completion_count_ = 0; |
@@ -193,7 +193,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) { |
mock_storage()->SimulateGetAllInfo(new AppCacheInfoCollection); |
service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_); |
EXPECT_EQ(0, delete_completion_count_); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(1, delete_completion_count_); |
EXPECT_EQ(net::OK, delete_result_); |
delete_completion_count_ = 0; |
@@ -215,7 +215,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) { |
mock_storage()->SimulateGetAllInfo(info); |
service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_); |
EXPECT_EQ(0, delete_completion_count_); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(1, delete_completion_count_); |
EXPECT_EQ(net::OK, delete_result_); |
delete_completion_count_ = 0; |
@@ -226,7 +226,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) { |
mock_storage()->SimulateMakeGroupObsoleteFailure(); |
service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_); |
EXPECT_EQ(0, delete_completion_count_); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(1, delete_completion_count_); |
EXPECT_EQ(net::ERR_FAILED, delete_result_); |
delete_completion_count_ = 0; |
@@ -242,7 +242,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) { |
// Let any tasks lingering from the sudden deletion run and verify |
// no other completion calls occur. |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(0, delete_completion_count_); |
} |
@@ -250,7 +250,7 @@ TEST_F(AppCacheServiceTest, CheckAppCacheResponse) { |
// Check a non-existing manifest. |
EXPECT_FALSE(IsGroupStored(kManifestUrl)); |
service_->CheckAppCacheResponse(kManifestUrl, 1, 1); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(0, CountPendingHelpers()); |
EXPECT_FALSE(IsGroupStored(kManifestUrl)); |
ResetStorage(); |
@@ -261,7 +261,7 @@ TEST_F(AppCacheServiceTest, CheckAppCacheResponse) { |
EXPECT_TRUE(IsGroupStored(kManifestUrl)); |
SetupMockReader(true, true, true); |
service_->CheckAppCacheResponse(kManifestUrl, kMockCacheId, kMockResponseId); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(0, CountPendingHelpers()); |
EXPECT_TRUE(IsGroupStored(kManifestUrl)); |
ResetStorage(); |
@@ -271,7 +271,7 @@ TEST_F(AppCacheServiceTest, CheckAppCacheResponse) { |
SetupMockGroup(); |
service_->CheckAppCacheResponse(kManifestUrl, kMockCacheId, |
kMissingResponseId); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(0, CountPendingHelpers()); |
EXPECT_FALSE(IsGroupStored(kManifestUrl)); |
ResetStorage(); |
@@ -281,7 +281,7 @@ TEST_F(AppCacheServiceTest, CheckAppCacheResponse) { |
SetupMockGroup(); |
service_->CheckAppCacheResponse(kManifestUrl, kMissingCacheId, |
kMissingResponseId); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(0, CountPendingHelpers()); |
EXPECT_TRUE(IsGroupStored(kManifestUrl)); |
ResetStorage(); |
@@ -290,7 +290,7 @@ TEST_F(AppCacheServiceTest, CheckAppCacheResponse) { |
SetupMockGroup(); |
service_->CheckAppCacheResponse(kManifestUrl, kMockCacheId, kMockResponseId); |
SetupMockReader(false, true, true); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(0, CountPendingHelpers()); |
EXPECT_FALSE(IsGroupStored(kManifestUrl)); |
ResetStorage(); |
@@ -299,7 +299,7 @@ TEST_F(AppCacheServiceTest, CheckAppCacheResponse) { |
SetupMockGroup(); |
service_->CheckAppCacheResponse(kManifestUrl, kMockCacheId, kMockResponseId); |
SetupMockReader(true, false, true); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(0, CountPendingHelpers()); |
EXPECT_FALSE(IsGroupStored(kManifestUrl)); |
ResetStorage(); |
@@ -308,13 +308,13 @@ TEST_F(AppCacheServiceTest, CheckAppCacheResponse) { |
SetupMockGroup(); |
service_->CheckAppCacheResponse(kManifestUrl, kMockCacheId, kMockResponseId); |
SetupMockReader(true, true, false); |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
EXPECT_EQ(0, CountPendingHelpers()); |
EXPECT_FALSE(IsGroupStored(kManifestUrl)); |
ResetStorage(); |
service_.reset(); // Clean up. |
- MessageLoop::current()->RunAllPending(); |
+ MessageLoop::current()->RunUntilIdle(); |
} |
} // namespace appcache |