diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-16 01:06:36 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-16 01:06:36 +0000 |
commit | 4e1c7e5b8474fb2bbe8696fc27bed597cab2a784 (patch) | |
tree | 174c6dbf14d169dab1b3eadcb5e416ee637a59ee /webkit/appcache | |
parent | 82c58589a5bcb4666fd235f461df23858b29462e (diff) | |
download | chromium_src-4e1c7e5b8474fb2bbe8696fc27bed597cab2a784.zip chromium_src-4e1c7e5b8474fb2bbe8696fc27bed597cab2a784.tar.gz chromium_src-4e1c7e5b8474fb2bbe8696fc27bed597cab2a784.tar.bz2 |
webkit: Update the calls from RunAllPending() to RunUntilIdle().
RunAllPending() is deprecated and we should switch to RunUntilIdle().
BUG=131220
TBR=darin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11595003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
-rw-r--r-- | webkit/appcache/appcache_quota_client_unittest.cc | 20 | ||||
-rw-r--r-- | webkit/appcache/appcache_service_unittest.cc | 26 | ||||
-rw-r--r-- | webkit/appcache/mock_appcache_storage_unittest.cc | 30 |
3 files changed, 38 insertions, 38 deletions
diff --git a/webkit/appcache/appcache_quota_client_unittest.cc b/webkit/appcache/appcache_quota_client_unittest.cc index e86aeef4..d586b94 100644 --- a/webkit/appcache/appcache_quota_client_unittest.cc +++ b/webkit/appcache/appcache_quota_client_unittest.cc @@ -44,7 +44,7 @@ class AppCacheQuotaClientTest : public testing::Test { quota::StorageType type) { usage_ = -1; AsyncGetOriginUsage(client, origin, type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return usage_; } @@ -53,7 +53,7 @@ class AppCacheQuotaClientTest : public testing::Test { quota::StorageType type) { origins_.clear(); AsyncGetOriginsForType(client, type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return origins_; } @@ -63,7 +63,7 @@ class AppCacheQuotaClientTest : public testing::Test { const std::string& host) { origins_.clear(); AsyncGetOriginsForHost(client, type, host); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return origins_; } @@ -73,7 +73,7 @@ class AppCacheQuotaClientTest : public testing::Test { const GURL& origin) { delete_status_ = quota::kQuotaStatusUnknown; AsyncDeleteOriginData(client, type, origin); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return delete_status_; } @@ -318,7 +318,7 @@ TEST_F(AppCacheQuotaClientTest, PendingRequests) { EXPECT_EQ(0, num_get_origin_usage_completions_); EXPECT_EQ(0, num_get_origins_completions_); EXPECT_EQ(0, num_delete_origins_completions_); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, num_get_origin_usage_completions_); EXPECT_EQ(0, num_get_origins_completions_); EXPECT_EQ(0, num_delete_origins_completions_); @@ -328,7 +328,7 @@ TEST_F(AppCacheQuotaClientTest, PendingRequests) { EXPECT_EQ(2, num_get_origin_usage_completions_); EXPECT_EQ(4, num_get_origins_completions_); EXPECT_EQ(0, num_delete_origins_completions_); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(3, num_delete_origins_completions_); // deletes are really async // They should be serviced in order requested. @@ -357,7 +357,7 @@ TEST_F(AppCacheQuotaClientTest, DestroyServiceWithPending) { AsyncDeleteOriginData(client, kTemp, kOriginA); AsyncDeleteOriginData(client, kPerm, kOriginA); AsyncDeleteOriginData(client, kTemp, kOriginB); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, num_get_origin_usage_completions_); EXPECT_EQ(0, num_get_origins_completions_); EXPECT_EQ(0, num_delete_origins_completions_); @@ -393,7 +393,7 @@ TEST_F(AppCacheQuotaClientTest, DestroyQuotaManagerWithPending) { AsyncDeleteOriginData(client, kTemp, kOriginA); AsyncDeleteOriginData(client, kPerm, kOriginA); AsyncDeleteOriginData(client, kTemp, kOriginB); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, num_get_origin_usage_completions_); EXPECT_EQ(0, num_get_origins_completions_); EXPECT_EQ(0, num_delete_origins_completions_); @@ -403,7 +403,7 @@ TEST_F(AppCacheQuotaClientTest, DestroyQuotaManagerWithPending) { Call_NotifyAppCacheReady(client); // Callbacks should be deleted and not called. - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, num_get_origin_usage_completions_); EXPECT_EQ(0, num_get_origins_completions_); EXPECT_EQ(0, num_delete_origins_completions_); @@ -428,7 +428,7 @@ TEST_F(AppCacheQuotaClientTest, DestroyWithDeleteInProgress) { // A real completion callback from the service should // be dropped if it comes in after NotifyAppCacheDestroyed. - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, num_delete_origins_completions_); EXPECT_EQ(quota::kQuotaErrorAbort, delete_status_); diff --git a/webkit/appcache/appcache_service_unittest.cc b/webkit/appcache/appcache_service_unittest.cc index 4a78396..37b334a 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 diff --git a/webkit/appcache/mock_appcache_storage_unittest.cc b/webkit/appcache/mock_appcache_storage_unittest.cc index 3ac8543..f230db2 100644 --- a/webkit/appcache/mock_appcache_storage_unittest.cc +++ b/webkit/appcache/mock_appcache_storage_unittest.cc @@ -84,7 +84,7 @@ TEST_F(MockAppCacheStorageTest, LoadCache_Miss) { MockStorageDelegate delegate; service.storage()->LoadCache(111, &delegate); EXPECT_NE(111, delegate.loaded_cache_id_); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(111, delegate.loaded_cache_id_); EXPECT_FALSE(delegate.loaded_cache_); } @@ -118,7 +118,7 @@ TEST_F(MockAppCacheStorageTest, CreateGroup) { service.storage()->LoadOrCreateGroup(manifest_url, &delegate); EXPECT_NE(manifest_url, delegate.loaded_manifest_url_); EXPECT_FALSE(delegate.loaded_group_.get()); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(manifest_url, delegate.loaded_manifest_url_); EXPECT_TRUE(delegate.loaded_group_.get()); EXPECT_TRUE(delegate.loaded_group_->HasOneRef()); @@ -137,7 +137,7 @@ TEST_F(MockAppCacheStorageTest, LoadGroup_NearHit) { // to be "unstored" and "currently in use". GURL manifest_url("http://blah/"); service.storage()->LoadOrCreateGroup(manifest_url, &delegate); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(manifest_url, delegate.loaded_manifest_url_); EXPECT_TRUE(delegate.loaded_group_.get()); @@ -189,7 +189,7 @@ TEST_F(MockAppCacheStorageTest, LoadGroupAndCache_FarHit) { storage->LoadCache(cache_id, &delegate); EXPECT_NE(cache_id, delegate.loaded_cache_id_); EXPECT_NE(cache_ptr, delegate.loaded_cache_.get()); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(cache_id, delegate.loaded_cache_id_); EXPECT_EQ(cache_ptr, delegate.loaded_cache_.get()); delegate.loaded_cache_ = NULL; @@ -200,7 +200,7 @@ TEST_F(MockAppCacheStorageTest, LoadGroupAndCache_FarHit) { storage->LoadOrCreateGroup(manifest_url, &delegate); EXPECT_NE(manifest_url, delegate.loaded_manifest_url_); EXPECT_FALSE(delegate.loaded_group_.get()); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(manifest_url, delegate.loaded_manifest_url_); EXPECT_EQ(group_ptr, delegate.loaded_group_.get()); } @@ -229,7 +229,7 @@ TEST_F(MockAppCacheStorageTest, StoreNewGroup) { EXPECT_FALSE(delegate.stored_group_success_); EXPECT_TRUE(storage->stored_caches_.empty()); EXPECT_TRUE(storage->stored_groups_.empty()); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_TRUE(delegate.stored_group_success_); EXPECT_FALSE(storage->stored_caches_.empty()); EXPECT_FALSE(storage->stored_groups_.empty()); @@ -270,7 +270,7 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroup) { EXPECT_EQ(size_t(1), storage->stored_groups_.size()); EXPECT_TRUE(storage->IsCacheStored(old_cache)); EXPECT_FALSE(storage->IsCacheStored(new_cache)); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_TRUE(delegate.stored_group_success_); EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); @@ -313,7 +313,7 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroupExistingCache) { EXPECT_FALSE(delegate.stored_group_success_); EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_TRUE(delegate.stored_group_success_); EXPECT_EQ(size_t(1), storage->stored_caches_.size()); EXPECT_EQ(size_t(1), storage->stored_groups_.size()); @@ -354,7 +354,7 @@ TEST_F(MockAppCacheStorageTest, MakeGroupObsolete) { EXPECT_EQ(size_t(1), storage->stored_groups_.size()); EXPECT_FALSE(cache->HasOneRef()); EXPECT_FALSE(group->HasOneRef()); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_TRUE(delegate.obsoleted_success_); EXPECT_EQ(group.get(), delegate.obsoleted_group_.get()); EXPECT_TRUE(group->is_obsolete()); @@ -399,7 +399,7 @@ TEST_F(MockAppCacheStorageTest, FindNoMainResponse) { EXPECT_NE(url, delegate.found_url_); storage->FindResponseForMainRequest(url, GURL(), &delegate); EXPECT_NE(url, delegate.found_url_); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(url, delegate.found_url_); EXPECT_TRUE(delegate.found_manifest_url_.is_empty()); EXPECT_EQ(kNoCacheId, delegate.found_cache_id_); @@ -436,7 +436,7 @@ TEST_F(MockAppCacheStorageTest, BasicFindMainResponse) { EXPECT_NE(kEntryUrl, delegate.found_url_); storage->FindResponseForMainRequest(kEntryUrl, GURL(), &delegate); EXPECT_NE(kEntryUrl, delegate.found_url_); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(kEntryUrl, delegate.found_url_); EXPECT_EQ(kManifestUrl, delegate.found_manifest_url_); EXPECT_EQ(kCacheId, delegate.found_cache_id_); @@ -493,7 +493,7 @@ TEST_F(MockAppCacheStorageTest, BasicFindMainFallbackResponse) { EXPECT_NE(kTestUrl, delegate.found_url_); storage->FindResponseForMainRequest(kTestUrl, GURL(), &delegate); EXPECT_NE(kTestUrl, delegate.found_url_); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(kTestUrl, delegate.found_url_); EXPECT_EQ(kManifestUrl, delegate.found_manifest_url_); EXPECT_EQ(kCacheId, delegate.found_cache_id_); @@ -550,7 +550,7 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseWithMultipleCandidates) { EXPECT_NE(kEntryUrl, delegate.found_url_); storage->FindResponseForMainRequest(kEntryUrl, GURL(), &delegate); EXPECT_NE(kEntryUrl, delegate.found_url_); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(kEntryUrl, delegate.found_url_); EXPECT_EQ(kManifestUrl2, delegate.found_manifest_url_); EXPECT_EQ(kCacheId2, delegate.found_cache_id_); @@ -596,7 +596,7 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseExclusions) { EXPECT_NE(kEntryUrl, delegate.found_url_); storage->FindResponseForMainRequest(kEntryUrl, GURL(), &delegate); EXPECT_NE(kEntryUrl, delegate.found_url_); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(kEntryUrl, delegate.found_url_); EXPECT_TRUE(delegate.found_manifest_url_.is_empty()); EXPECT_EQ(kNoCacheId, delegate.found_cache_id_); @@ -610,7 +610,7 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseExclusions) { EXPECT_NE(kOnlineNamespaceUrl, delegate.found_url_); storage->FindResponseForMainRequest(kOnlineNamespaceUrl, GURL(), &delegate); EXPECT_NE(kOnlineNamespaceUrl, delegate.found_url_); - MessageLoop::current()->RunAllPending(); // Do async task execution. + MessageLoop::current()->RunUntilIdle(); // Do async task execution. EXPECT_EQ(kOnlineNamespaceUrl, delegate.found_url_); EXPECT_TRUE(delegate.found_manifest_url_.is_empty()); EXPECT_EQ(kNoCacheId, delegate.found_cache_id_); |