diff options
33 files changed, 448 insertions, 448 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_); diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index f5a6024..54d8f3a 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -180,7 +180,7 @@ class BlobURLRequestJobTest : public testing::Test { true, // create base::Bind(&BlobURLRequestJobTest::OnValidateFileSystem, base::Unretained(this))); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_TRUE(file_system_root_url_.is_valid()); // Prepare files on file system. diff --git a/webkit/blob/local_file_stream_reader_unittest.cc b/webkit/blob/local_file_stream_reader_unittest.cc index 9c2a228d..3aaf005 100644 --- a/webkit/blob/local_file_stream_reader_unittest.cc +++ b/webkit/blob/local_file_stream_reader_unittest.cc @@ -75,7 +75,7 @@ class LocalFileStreamReaderTest : public testing::Test { virtual void TearDown() OVERRIDE { // Give another chance for deleted streams to perform Close. - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); file_thread_.Stop(); } diff --git a/webkit/blob/shareable_file_reference_unittest.cc b/webkit/blob/shareable_file_reference_unittest.cc index 7136fcd..d75a1be 100644 --- a/webkit/blob/shareable_file_reference_unittest.cc +++ b/webkit/blob/shareable_file_reference_unittest.cc @@ -44,13 +44,13 @@ TEST(ShareableFileReferenceTest, TestReferences) { // Drop the first reference, the file and reference should still be there. reference1 = NULL; EXPECT_TRUE(ShareableFileReference::Get(file).get()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(file_util::PathExists(file)); // Drop the second reference, the file and reference should get deleted. reference2 = NULL; EXPECT_FALSE(ShareableFileReference::Get(file).get()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(file_util::PathExists(file)); // TODO(michaeln): add a test for files that aren't deletable behavior. diff --git a/webkit/chromeos/fileapi/memory_file_util_unittest.cc b/webkit/chromeos/fileapi/memory_file_util_unittest.cc index 8011de2..024e849 100644 --- a/webkit/chromeos/fileapi/memory_file_util_unittest.cc +++ b/webkit/chromeos/fileapi/memory_file_util_unittest.cc @@ -241,7 +241,7 @@ TEST_F(MemoryFileUtilTest, TestCreateGetFileInfo) { // enough to wait for answer. In that case the thread should be blocked // until the callback is called (ex. use Run() instead here, and call // Quit() from callback). - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_GET_FILE_INFO, GetStatusType(request_id1)); CallbackStatus status = GetStatus(request_id1); @@ -252,7 +252,7 @@ TEST_F(MemoryFileUtilTest, TestCreateGetFileInfo) { const int request_id2 = GetNextRequestId(); file_util()->Create(FilePath("/mnt/memory/test.txt"), GetStatusCallback(request_id2)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_STATUS, GetStatusType(request_id2)); status = GetStatus(request_id2); ASSERT_EQ(base::PLATFORM_FILE_OK, status.result); @@ -260,7 +260,7 @@ TEST_F(MemoryFileUtilTest, TestCreateGetFileInfo) { const int request_id3 = GetNextRequestId(); file_util()->GetFileInfo(FilePath("/mnt/memory/test.txt"), GetGetFileInfoCallback(request_id3)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); base::Time end_create = base::Time::Now(); @@ -283,7 +283,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { file_util()->GetFileInfo(FilePath("/mnt/memory/test1.txt"), GetGetFileInfoCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_GET_FILE_INFO, GetStatusType(request_id1)); CallbackStatus status = GetStatus(request_id1); @@ -297,7 +297,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { base::PLATFORM_FILE_CREATE_ALWAYS | base::PLATFORM_FILE_WRITE, GetOpenCallback(request_id2)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); base::Time end_create = base::Time::Now(); @@ -312,7 +312,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { const int request_id3 = GetNextRequestId(); file_util()->GetFileInfo(FilePath("/mnt/memory/test1.txt"), GetGetFileInfoCallback(request_id3)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_GET_FILE_INFO, GetStatusType(request_id3)); status = GetStatus(request_id3); @@ -329,7 +329,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { base::Time start_write = base::Time::Now(); write_file_stream->Write(kTestString, 10, GetReadWriteCallback(request_id4)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); base::Time end_write = base::Time::Now(); ASSERT_EQ(CALLBACK_TYPE_READ_WRITE, GetStatusType(request_id4)); @@ -342,7 +342,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { const int request_id5 = GetNextRequestId(); file_util()->GetFileInfo(FilePath("/mnt/memory/test1.txt"), GetGetFileInfoCallback(request_id5)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_GET_FILE_INFO, GetStatusType(request_id5)); status = GetStatus(request_id5); @@ -358,7 +358,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { write_file_stream->Write(kTestString + 10, kTestStringLength - 10, GetReadWriteCallback(request_id6)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); end_write = base::Time::Now(); ASSERT_EQ(CALLBACK_TYPE_READ_WRITE, GetStatusType(request_id6)); @@ -371,7 +371,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { const int request_id7 = GetNextRequestId(); file_util()->GetFileInfo(FilePath("/mnt/memory/test1.txt"), GetGetFileInfoCallback(request_id7)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_GET_FILE_INFO, GetStatusType(request_id7)); status = GetStatus(request_id7); @@ -386,7 +386,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { file_util()->Open(FilePath("/mnt/memory/test1.txt"), base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ, GetOpenCallback(request_id8)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_OPEN, GetStatusType(request_id8)); status = GetStatus(request_id8); @@ -399,7 +399,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { char buffer[1024]; const int request_id9 = GetNextRequestId(); read_file_stream->Read(buffer, 1023, GetReadWriteCallback(request_id9)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_READ_WRITE, GetStatusType(request_id9)); status = GetStatus(request_id9); @@ -415,7 +415,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { const int request_id10 = GetNextRequestId(); file_util()->GetFileInfo(FilePath("/mnt/memory/test1.txt"), GetGetFileInfoCallback(request_id10)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_GET_FILE_INFO, GetStatusType(request_id10)); status = GetStatus(request_id10); @@ -430,7 +430,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { file_util()->Open(FilePath("/mnt/memory/test1.txt"), base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_WRITE, GetOpenCallback(request_id11)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_OPEN, GetStatusType(request_id11)); status = GetStatus(request_id11); @@ -443,7 +443,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { const int request_id12 = GetNextRequestId(); file_util()->GetFileInfo(FilePath("/mnt/memory/test1.txt"), GetGetFileInfoCallback(request_id12)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_GET_FILE_INFO, GetStatusType(request_id12)); status = GetStatus(request_id12); @@ -454,7 +454,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { const int request_id13 = GetNextRequestId(); write_file_stream2->Seek(1000, GetStatusCallback(request_id13)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_STATUS, GetStatusType(request_id13)); status = GetStatus(request_id13); ASSERT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status.result); @@ -465,7 +465,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { read_file_stream->Write(kTestString, kTestStringLength, GetReadWriteCallback(request_id14)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); status = GetStatus(request_id14); ASSERT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status.result); @@ -474,14 +474,14 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { const int request_id15 = GetNextRequestId(); write_file_stream2->Seek(10, GetStatusCallback(request_id15)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id15).result); const int request_id16 = GetNextRequestId(); write_file_stream2->Write(kTestString, kTestStringLength, GetReadWriteCallback(request_id16)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); status = GetStatus(request_id16); ASSERT_EQ(base::PLATFORM_FILE_OK, status.result); ASSERT_EQ(static_cast<int64>(kTestStringLength), status.length); @@ -491,7 +491,7 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { const int request_id17 = GetNextRequestId(); file_util()->GetFileInfo(FilePath("/mnt/memory/test1.txt"), GetGetFileInfoCallback(request_id17)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); status = GetStatus(request_id17); ASSERT_EQ(base::PLATFORM_FILE_OK, status.result); ASSERT_EQ(static_cast<int64>(kTestStringLength) + 10, @@ -500,12 +500,12 @@ TEST_F(MemoryFileUtilTest, TestReadWrite) { // Read from 10th byte. const int request_id18 = GetNextRequestId(); read_file_stream->Seek(10, GetStatusCallback(request_id18)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id18).result); const int request_id19 = GetNextRequestId(); read_file_stream->Read(buffer, 1023, GetReadWriteCallback(request_id19)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); status = GetStatus(request_id19); ASSERT_EQ(base::PLATFORM_FILE_OK, status.result); ASSERT_EQ(static_cast<int64>(kTestStringLength), status.length); @@ -534,7 +534,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { file_util()->ReadDirectory(FilePath("/mnt/memory/"), GetReadDirectoryCallback(request_id0)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(CALLBACK_TYPE_READ_DIRECTORY, GetStatusType(request_id0)); CallbackStatus& status = GetStatus(request_id0); @@ -562,7 +562,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { file_util()->CreateDirectory(FilePath("/mnt/memory/c"), GetStatusCallback(request_id2)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); base::Time end_create = base::Time::Now(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); @@ -586,7 +586,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { file_util()->ReadDirectory(FilePath("/mnt/memory/d/"), GetReadDirectoryCallback(request_id4)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); status = GetStatus(request_id1); @@ -661,11 +661,11 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { kTestString, kTestStringLength); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); CreateEmptyFile(FilePath("/mnt/memory/b/g/h")); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); end_create = base::Time::Now(); // Read /mnt/memory and check that the number of entries is unchanged. @@ -674,7 +674,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { file_util()->ReadDirectory(FilePath("/mnt/memory"), GetReadDirectoryCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); status = GetStatus(request_id1); @@ -689,7 +689,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { file_util()->ReadDirectory(FilePath("/mnt/memory/b"), GetReadDirectoryCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); status = GetStatus(request_id1); @@ -743,7 +743,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { request_id1 = GetNextRequestId(); file_util()->Remove(FilePath("/mnt/memory/b/f"), false /* recursive */, GetStatusCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); // Check the number of files in b/ @@ -752,7 +752,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { file_util()->ReadDirectory(FilePath("/mnt/memory/b"), GetReadDirectoryCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); status = GetStatus(request_id1); @@ -765,7 +765,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { request_id1 = GetNextRequestId(); file_util()->Remove(FilePath("/mnt/memory/b"), false /* recursive */, GetStatusCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_ERROR_NOT_A_FILE, GetStatus(request_id1).result); @@ -774,13 +774,13 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { request_id1 = GetNextRequestId(); file_util()->Remove(FilePath("/mnt/memory/b/d"), false /* recursive */, GetStatusCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); request_id1 = GetNextRequestId(); file_util()->GetFileInfo(FilePath("/mnt/memory/b/d"), GetGetFileInfoCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, GetStatus(request_id1).result); // Remove /mnt/memory/b recursively. @@ -788,7 +788,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { request_id1 = GetNextRequestId(); file_util()->Remove(FilePath("/mnt/memory/b"), true /* recursive */, GetStatusCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); // ReadDirectory /mnt/memory/b -> not found @@ -796,7 +796,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { request_id1 = GetNextRequestId(); file_util()->ReadDirectory(FilePath("/mnt/memory/b"), GetReadDirectoryCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, GetStatus(request_id1).result); // ReadDirectory /mnt/memory @@ -805,7 +805,7 @@ TEST_F(MemoryFileUtilTest, TestDirectoryOperations) { file_util()->ReadDirectory(FilePath("/mnt/memory"), GetReadDirectoryCallback(request_id1)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, GetStatus(request_id1).result); status = GetStatus(request_id1); diff --git a/webkit/database/database_quota_client_unittest.cc b/webkit/database/database_quota_client_unittest.cc index 0de5359..286347c 100644 --- a/webkit/database/database_quota_client_unittest.cc +++ b/webkit/database/database_quota_client_unittest.cc @@ -141,7 +141,7 @@ class DatabaseQuotaClientTest : public testing::Test { origin, type, base::Bind(&DatabaseQuotaClientTest::OnGetOriginUsageComplete, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return usage_; } @@ -153,7 +153,7 @@ class DatabaseQuotaClientTest : public testing::Test { type, base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return origins_; } @@ -166,7 +166,7 @@ class DatabaseQuotaClientTest : public testing::Test { type, host, base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return origins_; } @@ -179,7 +179,7 @@ class DatabaseQuotaClientTest : public testing::Test { origin, type, base::Bind(&DatabaseQuotaClientTest::OnDeleteOriginDataComplete, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return delete_status_ == quota::kQuotaStatusOk; } diff --git a/webkit/dom_storage/dom_storage_area_unittest.cc b/webkit/dom_storage/dom_storage_area_unittest.cc index 858176a..4513ea3 100644 --- a/webkit/dom_storage/dom_storage_area_unittest.cc +++ b/webkit/dom_storage/dom_storage_area_unittest.cc @@ -183,7 +183,7 @@ TEST_F(DomStorageAreaTest, BackingDatabaseOpened) { EXPECT_TRUE(area->commit_batch_.get()); EXPECT_EQ(0, area->commit_batches_in_flight_); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(area->commit_batch_.get()); EXPECT_EQ(0, area->commit_batches_in_flight_); @@ -232,7 +232,7 @@ TEST_F(DomStorageAreaTest, CommitTasks) { EXPECT_TRUE(area->commit_batch_.get()); EXPECT_FALSE(area->commit_batch_->clear_all_first); EXPECT_EQ(2u, area->commit_batch_->changed_values.size()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(area->HasUncommittedChanges()); EXPECT_FALSE(area->commit_batch_.get()); EXPECT_EQ(0, area->commit_batches_in_flight_); @@ -248,7 +248,7 @@ TEST_F(DomStorageAreaTest, CommitTasks) { EXPECT_TRUE(area->commit_batch_.get()); EXPECT_TRUE(area->commit_batch_->clear_all_first); EXPECT_TRUE(area->commit_batch_->changed_values.empty()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(area->commit_batch_.get()); EXPECT_EQ(0, area->commit_batches_in_flight_); // Verify the changes made it to the database. @@ -268,7 +268,7 @@ TEST_F(DomStorageAreaTest, CommitTasks) { FROM_HERE, base::Bind(&DomStorageAreaTest::InjectedCommitSequencingTask, base::Unretained(this), area)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(area->HasOneRef()); EXPECT_FALSE(area->HasUncommittedChanges()); // Verify the changes made it to the database. @@ -299,7 +299,7 @@ TEST_F(DomStorageAreaTest, CommitChangesAtShutdown) { area->backing_->ReadAllValues(&values); EXPECT_TRUE(values.empty()); // not committed yet area->Shutdown(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(area->HasOneRef()); EXPECT_FALSE(area->backing_.get()); // The VerifyChangesCommittedDatabase destructor verifies values @@ -327,7 +327,7 @@ TEST_F(DomStorageAreaTest, DeleteOrigin) { // Commit something in the database and then delete. NullableString16 old_value; area->SetItem(kKey, kValue, &old_value); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(file_util::PathExists(db_file_path)); area->DeleteOrigin(); EXPECT_EQ(0u, area->Length()); @@ -342,14 +342,14 @@ TEST_F(DomStorageAreaTest, DeleteOrigin) { area->DeleteOrigin(); EXPECT_TRUE(area->HasUncommittedChanges()); EXPECT_EQ(0u, area->Length()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(area->HasUncommittedChanges()); EXPECT_FALSE(file_util::PathExists(db_file_path)); // Put some uncommitted changes to a an existing database in // and then delete. area->SetItem(kKey, kValue, &old_value); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(file_util::PathExists(db_file_path)); area->SetItem(kKey2, kValue2, &old_value); EXPECT_TRUE(area->HasUncommittedChanges()); @@ -357,13 +357,13 @@ TEST_F(DomStorageAreaTest, DeleteOrigin) { area->DeleteOrigin(); EXPECT_TRUE(area->HasUncommittedChanges()); EXPECT_EQ(0u, area->Length()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(area->HasUncommittedChanges()); // Since the area had uncommitted changes at the time delete // was called, the file will linger until the shutdown time. EXPECT_TRUE(file_util::PathExists(db_file_path)); area->Shutdown(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(file_util::PathExists(db_file_path)); } @@ -407,7 +407,7 @@ TEST_F(DomStorageAreaTest, PurgeMemory) { EXPECT_EQ(original_map, area->map_.get()); // Commit the changes from above, - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(area->HasUncommittedChanges()); new_backing = static_cast<LocalStorageDatabaseAdapter*>( area->backing_.get())->db_.get(); diff --git a/webkit/dom_storage/dom_storage_context_unittest.cc b/webkit/dom_storage/dom_storage_context_unittest.cc index 5481f43..39e8252 100644 --- a/webkit/dom_storage/dom_storage_context_unittest.cc +++ b/webkit/dom_storage/dom_storage_context_unittest.cc @@ -48,7 +48,7 @@ class DomStorageContextTest : public testing::Test { } virtual void TearDown() { - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } void VerifySingleOriginRemains(const GURL& origin) { @@ -104,7 +104,7 @@ TEST_F(DomStorageContextTest, UsageInfo) { OpenStorageArea(kOrigin)->SetItem(kKey, kValue, &old_value)); context_->Shutdown(); context_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Create a new context that points to the same directory, see that // it knows about the origin that we stored data for. @@ -136,7 +136,7 @@ TEST_F(DomStorageContextTest, SessionOnly) { OpenStorageArea(kSessionOnlyOrigin)->SetItem(kKey, kValue, &old_value)); context_->Shutdown(); context_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Verify that the session-only origin data is gone. VerifySingleOriginRemains(kOrigin); @@ -154,7 +154,7 @@ TEST_F(DomStorageContextTest, SetForceKeepSessionState) { context_->SetForceKeepSessionState(); // Should override clear behavior. context_->Shutdown(); context_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); VerifySingleOriginRemains(kSessionOnlyOrigin); } @@ -214,7 +214,7 @@ TEST_F(DomStorageContextTest, DeleteSessionStorage) { // Destroy and recreate the DomStorageContext. context_->Shutdown(); context_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); context_ = new DomStorageContext(temp_dir_.path(), temp_dir_.path(), storage_policy_, @@ -239,7 +239,7 @@ TEST_F(DomStorageContextTest, DeleteSessionStorage) { // Destroy and recreate again. context_->Shutdown(); context_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); context_ = new DomStorageContext(temp_dir_.path(), temp_dir_.path(), storage_policy_, @@ -256,7 +256,7 @@ TEST_F(DomStorageContextTest, DeleteSessionStorage) { dom_namespace->CloseStorageArea(area); context_->Shutdown(); context_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } } // namespace dom_storage diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc index 3d24205..029b00e 100644 --- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc @@ -62,7 +62,7 @@ class FileSystemDirURLRequestJobTest : public testing::Test { GURL("http://remote/"), kFileSystemTypeTemporary, true, // create base::Bind(&FileSystemDirURLRequestJobTest::OnValidateFileSystem, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); net::URLRequest::Deprecated::RegisterProtocolFactory( "filesystem", &FileSystemDirURLRequestJobFactory); @@ -287,7 +287,7 @@ TEST_F(FileSystemDirURLRequestJobTest, Cancel) { TestRequestNoRun(CreateFileSystemURL("foo/")); // Run StartAsync() and only StartAsync(). MessageLoop::current()->DeleteSoon(FROM_HERE, request_.release()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // If we get here, success! we didn't crash! } diff --git a/webkit/fileapi/file_system_file_stream_reader_unittest.cc b/webkit/fileapi/file_system_file_stream_reader_unittest.cc index c2de0cd..456e30d 100644 --- a/webkit/fileapi/file_system_file_stream_reader_unittest.cc +++ b/webkit/fileapi/file_system_file_stream_reader_unittest.cc @@ -80,14 +80,14 @@ class FileSystemFileStreamReaderTest : public testing::Test { file_system_context_->sandbox_provider()->ValidateFileSystemRoot( GURL(kURLOrigin), kFileSystemTypeTemporary, true, // create base::Bind(&OnValidateFileSystem)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); WriteFile(kTestFileName, kTestData, kTestDataSize, &test_file_modification_time_); } virtual void TearDown() OVERRIDE { - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } protected: diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc index 4dc3383..9ca9666 100644 --- a/webkit/fileapi/file_system_quota_client_unittest.cc +++ b/webkit/fileapi/file_system_quota_client_unittest.cc @@ -81,7 +81,7 @@ class FileSystemQuotaClientTest : public testing::Test { const std::string& origin_url, quota::StorageType type) { GetOriginUsageAsync(quota_client, origin_url, type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return usage_; } @@ -92,7 +92,7 @@ class FileSystemQuotaClientTest : public testing::Test { type, base::Bind(&FileSystemQuotaClientTest::OnGetOrigins, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return origins_; } @@ -104,7 +104,7 @@ class FileSystemQuotaClientTest : public testing::Test { type, host, base::Bind(&FileSystemQuotaClientTest::OnGetOrigins, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return origins_; } @@ -437,7 +437,7 @@ TEST_F(FileSystemQuotaClientTest, GetUsage_MultipleTasks) { GetOriginUsageAsync(quota_client.get(), kDummyURL1, kTemporary); RunAdditionalOriginUsageTask(quota_client.get(), kDummyURL1, kTemporary); RunAdditionalOriginUsageTask(quota_client.get(), kDummyURL1, kTemporary); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(11 + 22 + file_paths_cost, usage()); EXPECT_EQ(2, additional_callback_count()); @@ -446,7 +446,7 @@ TEST_F(FileSystemQuotaClientTest, GetUsage_MultipleTasks) { RunAdditionalOriginUsageTask(quota_client.get(), kDummyURL1, kTemporary); GetOriginUsageAsync(quota_client.get(), kDummyURL1, kTemporary); RunAdditionalOriginUsageTask(quota_client.get(), kDummyURL1, kTemporary); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(11 + 22 + file_paths_cost, usage()); EXPECT_EQ(2, additional_callback_count()); } @@ -548,15 +548,15 @@ TEST_F(FileSystemQuotaClientTest, DeleteOriginTest) { "https://bar.com/", kPersistent); DeleteOriginData(quota_client.get(), "http://foo.com/", kTemporary); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(quota::kQuotaStatusOk, status()); DeleteOriginData(quota_client.get(), "http://bar.com/", kPersistent); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(quota::kQuotaStatusOk, status()); DeleteOriginData(quota_client.get(), "http://buz.com/", kTemporary); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(quota::kQuotaStatusOk, status()); EXPECT_EQ(0, GetOriginUsage( diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc index b0091dc..0efb40a 100644 --- a/webkit/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc @@ -73,7 +73,7 @@ class FileSystemURLRequestJobTest : public testing::Test { GURL("http://remote/"), kFileSystemTypeTemporary, true, // create base::Bind(&FileSystemURLRequestJobTest::OnValidateFileSystem, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); net::URLRequest::Deprecated::RegisterProtocolFactory( "filesystem", &FileSystemURLRequestJobFactory); @@ -87,7 +87,7 @@ class FileSystemURLRequestJobTest : public testing::Test { pending_job_ = NULL; } // FileReader posts a task to close the file in destructor. - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } void OnValidateFileSystem(base::PlatformFileError result) { @@ -341,7 +341,7 @@ TEST_F(FileSystemURLRequestJobTest, Cancel) { // Run StartAsync() and only StartAsync(). MessageLoop::current()->DeleteSoon(FROM_HERE, request_.release()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // If we get here, success! we didn't crash! } diff --git a/webkit/fileapi/local_file_stream_writer_unittest.cc b/webkit/fileapi/local_file_stream_writer_unittest.cc index 2a7fa68..3fda6d6 100644 --- a/webkit/fileapi/local_file_stream_writer_unittest.cc +++ b/webkit/fileapi/local_file_stream_writer_unittest.cc @@ -82,7 +82,7 @@ TEST_F(LocalFileStreamWriterTest, Write) { EXPECT_EQ(net::OK, WriteStringToWriter(writer.get(), "foo")); EXPECT_EQ(net::OK, WriteStringToWriter(writer.get(), "bar")); writer.reset(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(file_util::PathExists(path)); EXPECT_EQ("foobar", GetFileContent(path)); } @@ -92,7 +92,7 @@ TEST_F(LocalFileStreamWriterTest, WriteMiddle) { scoped_ptr<LocalFileStreamWriter> writer(new LocalFileStreamWriter(path, 2)); EXPECT_EQ(net::OK, WriteStringToWriter(writer.get(), "xxx")); writer.reset(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(file_util::PathExists(path)); EXPECT_EQ("foxxxr", GetFileContent(path)); } @@ -102,7 +102,7 @@ TEST_F(LocalFileStreamWriterTest, WriteEnd) { scoped_ptr<LocalFileStreamWriter> writer(new LocalFileStreamWriter(path, 6)); EXPECT_EQ(net::OK, WriteStringToWriter(writer.get(), "xxx")); writer.reset(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(file_util::PathExists(path)); EXPECT_EQ("foobarxxx", GetFileContent(path)); } @@ -113,7 +113,7 @@ TEST_F(LocalFileStreamWriterTest, WriteFailForNonexistingFile) { scoped_ptr<LocalFileStreamWriter> writer(new LocalFileStreamWriter(path, 0)); EXPECT_EQ(net::ERR_FILE_NOT_FOUND, WriteStringToWriter(writer.get(), "foo")); writer.reset(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(file_util::PathExists(path)); } @@ -135,7 +135,7 @@ TEST_F(LocalFileStreamWriterTest, CancelAfterFinishedOperation) { EXPECT_EQ(net::ERR_UNEXPECTED, cancel_result); writer.reset(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Write operation is already completed. EXPECT_TRUE(file_util::PathExists(path)); EXPECT_EQ("foo", GetFileContent(path)); diff --git a/webkit/fileapi/local_file_system_operation_unittest.cc b/webkit/fileapi/local_file_system_operation_unittest.cc index 1fe046a..cd66c5b 100644 --- a/webkit/fileapi/local_file_system_operation_unittest.cc +++ b/webkit/fileapi/local_file_system_operation_unittest.cc @@ -232,7 +232,7 @@ class LocalFileSystemOperationTest test_helper_.storage_type(), base::Bind(&LocalFileSystemOperationTest::DidGetUsageAndQuota, &status, usage, quota)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(quota::kQuotaStatusOk, status); } @@ -246,7 +246,7 @@ class LocalFileSystemOperationTest false /* recursive */, base::Bind(&AssertFileErrorEq, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 total_usage; GetUsageAndQuota(&total_usage, NULL); @@ -324,7 +324,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveFailureSrcDoesntExist) { FileSystemURL dest(URLForPath(FilePath(FILE_PATH_LITERAL("b")))); change_observer()->ResetCount(); operation()->Move(src, dest, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -334,7 +334,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveFailureContainsPath) { FilePath dest_dir_path(CreateUniqueDirInDir(src_dir_path)); operation()->Move(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -347,7 +347,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveFailureSrcDirExistsDestFile) { operation()->Move(URLForPath(src_dir_path), URLForPath(dest_file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -361,7 +361,7 @@ TEST_F(LocalFileSystemOperationTest, operation()->Move(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_EMPTY, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -374,7 +374,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveFailureSrcFileExistsDestDir) { operation()->Move(URLForPath(src_file_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -387,7 +387,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveFailureDestParentDoesntExist) { operation()->Move(URLForPath(src_dir_path), URLForPath(nonexisting_file), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -400,7 +400,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveSuccessSrcFileAndOverwrite) { operation()->Move(URLForPath(src_file_path), URLForPath(dest_file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(FileExists(dest_file_path)); @@ -421,7 +421,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveSuccessSrcFileAndNew) { operation()->Move(URLForPath(src_file_path), URLForPath(dest_file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(FileExists(dest_file_path)); @@ -436,7 +436,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveSuccessSrcDirAndOverwrite) { operation()->Move(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_FALSE(DirectoryExists(src_dir_path)); @@ -458,7 +458,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveSuccessSrcDirAndNew) { operation()->Move(URLForPath(src_dir_path), URLForPath(dest_child_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_FALSE(DirectoryExists(src_dir_path)); EXPECT_TRUE(DirectoryExists(dest_child_dir_path)); @@ -478,7 +478,7 @@ TEST_F(LocalFileSystemOperationTest, TestMoveSuccessSrcDirRecursive) { operation()->Move(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(DirectoryExists(dest_dir_path.Append( VirtualPath::BaseName(child_dir_path)))); @@ -497,7 +497,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyFailureSrcDoesntExist) { operation()->Copy(URLForPath(FilePath(FILE_PATH_LITERAL("a"))), URLForPath(FilePath(FILE_PATH_LITERAL("b"))), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -507,7 +507,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyFailureContainsPath) { FilePath dest_dir_path(CreateUniqueDirInDir(src_dir_path)); operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -520,7 +520,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyFailureSrcDirExistsDestFile) { operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -534,7 +534,7 @@ TEST_F(LocalFileSystemOperationTest, operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_EMPTY, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -547,7 +547,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyFailureSrcFileExistsDestDir) { operation()->Copy(URLForPath(src_file_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -563,7 +563,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyFailureDestParentDoesntExist) { operation()->Copy(URLForPath(src_dir_path), URLForPath(nonexisting_file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -584,7 +584,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyFailureByQuota) { operation()->Truncate(URLForPath(src_file_path), 6, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); AddQuota(6 + dest_path_cost - 1); @@ -594,7 +594,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyFailureByQuota) { operation()->Copy(URLForPath(src_file_path), URLForPath(dest_file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, status()); EXPECT_FALSE(FileExists(dest_file_path)); } @@ -607,7 +607,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopySuccessSrcFileAndOverwrite) { operation()->Copy(URLForPath(src_file_path), URLForPath(dest_file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(FileExists(dest_file_path)); EXPECT_EQ(1, quota_manager_proxy()->notify_storage_accessed_count()); @@ -624,7 +624,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopySuccessSrcFileAndNew) { operation()->Copy(URLForPath(src_file_path), URLForPath(dest_file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(FileExists(dest_file_path)); EXPECT_EQ(1, quota_manager_proxy()->notify_storage_accessed_count()); @@ -639,7 +639,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopySuccessSrcDirAndOverwrite) { operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); // Make sure we've overwritten but not copied the source under the |dest_dir|. @@ -661,7 +661,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopySuccessSrcDirAndNew) { operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_child_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(DirectoryExists(dest_child_dir_path)); EXPECT_EQ(1, quota_manager_proxy()->notify_storage_accessed_count()); @@ -679,7 +679,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopySuccessSrcDirRecursive) { FilePath dest_dir_path(CreateUniqueDir()); operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(DirectoryExists(dest_dir_path.Append( VirtualPath::BaseName(child_dir_path)))); @@ -711,7 +711,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyInForeignFileSuccess) { operation()->CopyInForeignFile(src_local_disk_file_path, dest_file_url, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, change_observer()->create_file_count()); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(FileExists(dest_file_path)); @@ -746,7 +746,7 @@ TEST_F(LocalFileSystemOperationTest, TestCopyInForeignFileFailureByQuota) { operation()->CopyInForeignFile(src_local_disk_file_path, dest_file_url, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(!FileExists(dest_file_path)); EXPECT_EQ(0, change_observer()->create_file_count()); @@ -759,7 +759,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateFileFailure) { FilePath file_path(CreateUniqueFileInDir(dir_path)); operation()->CreateFile(URLForPath(file_path), true, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_EXISTS, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -770,7 +770,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateFileSuccessFileExists) { FilePath file_path(CreateUniqueFileInDir(dir_path)); operation()->CreateFile(URLForPath(file_path), false, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(FileExists(file_path)); @@ -784,7 +784,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateFileSuccessExclusive) { FilePath file_path(dir_path.Append(FILE_PATH_LITERAL("FileDoesntExist"))); operation()->CreateFile(URLForPath(file_path), true, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(FileExists(file_path)); EXPECT_EQ(1, change_observer()->get_and_reset_create_file_count()); @@ -796,7 +796,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateFileSuccessFileDoesntExist) { FilePath file_path(dir_path.Append(FILE_PATH_LITERAL("FileDoesntExist"))); operation()->CreateFile(URLForPath(file_path), false, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_EQ(1, change_observer()->get_and_reset_create_file_count()); } @@ -810,7 +810,7 @@ TEST_F(LocalFileSystemOperationTest, FILE_PATH_LITERAL("FileDoesntExist"))); operation()->CreateDirectory(URLForPath(nonexisting_file_path), false, false, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -820,7 +820,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateDirFailureDirExists) { FilePath src_dir_path(CreateUniqueDir()); operation()->CreateDirectory(URLForPath(src_dir_path), true, false, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_EXISTS, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -831,7 +831,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateDirFailureFileExists) { FilePath file_path(CreateUniqueFileInDir(dir_path)); operation()->CreateDirectory(URLForPath(file_path), true, false, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_EXISTS, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -841,7 +841,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateDirSuccess) { FilePath dir_path(CreateUniqueDir()); operation()->CreateDirectory(URLForPath(dir_path), false, false, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(change_observer()->HasNoChange()); @@ -850,7 +850,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateDirSuccess) { FILE_PATH_LITERAL("nonexistingdir"))); operation()->CreateDirectory(URLForPath(nonexisting_dir_path), false, false, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(DirectoryExists(nonexisting_dir_path)); EXPECT_EQ(1, change_observer()->get_and_reset_create_directory_count()); @@ -863,7 +863,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateDirSuccessExclusive) { operation()->CreateDirectory(URLForPath(nonexisting_dir_path), true, false, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(DirectoryExists(nonexisting_dir_path)); EXPECT_EQ(1, change_observer()->get_and_reset_create_directory_count()); @@ -875,18 +875,18 @@ TEST_F(LocalFileSystemOperationTest, TestExistsAndMetadataFailure) { FILE_PATH_LITERAL("nonexistingdir"))); operation()->GetMetadata(URLForPath(nonexisting_dir_path), RecordMetadataCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); operation()->FileExists(URLForPath(nonexisting_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); file_util::EnsureEndsWithSeparator(&nonexisting_dir_path); operation()->DirectoryExists(URLForPath(nonexisting_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -897,12 +897,12 @@ TEST_F(LocalFileSystemOperationTest, TestExistsAndMetadataSuccess) { operation()->DirectoryExists(URLForPath(dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); ++read_access; operation()->GetMetadata(URLForPath(dir_path), RecordMetadataCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(info().is_directory); EXPECT_EQ(FilePath(), path()); @@ -910,12 +910,12 @@ TEST_F(LocalFileSystemOperationTest, TestExistsAndMetadataSuccess) { FilePath file_path(CreateUniqueFileInDir(dir_path)); operation()->FileExists(URLForPath(file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); ++read_access; operation()->GetMetadata(URLForPath(file_path), RecordMetadataCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_FALSE(info().is_directory); EXPECT_EQ(PlatformPath(file_path), path()); @@ -929,13 +929,13 @@ TEST_F(LocalFileSystemOperationTest, TestExistsAndMetadataSuccess) { TEST_F(LocalFileSystemOperationTest, TestTypeMismatchErrors) { FilePath dir_path(CreateUniqueDir()); operation()->FileExists(URLForPath(dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_A_FILE, status()); FilePath file_path(CreateUniqueFileInDir(dir_path)); ASSERT_FALSE(file_path.empty()); operation()->DirectoryExists(URLForPath(file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY, status()); } @@ -946,7 +946,7 @@ TEST_F(LocalFileSystemOperationTest, TestReadDirFailure) { file_util::EnsureEndsWithSeparator(&nonexisting_dir_path); operation()->ReadDirectory(URLForPath(nonexisting_dir_path), RecordReadDirectoryCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); // File exists. @@ -954,7 +954,7 @@ TEST_F(LocalFileSystemOperationTest, TestReadDirFailure) { FilePath file_path(CreateUniqueFileInDir(dir_path)); operation()->ReadDirectory(URLForPath(file_path), RecordReadDirectoryCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // TODO(kkanetkar) crbug.com/54309 to change the error code. EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); EXPECT_TRUE(change_observer()->HasNoChange()); @@ -972,7 +972,7 @@ TEST_F(LocalFileSystemOperationTest, TestReadDirSuccess) { operation()->ReadDirectory(URLForPath(parent_dir_path), RecordReadDirectoryCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_EQ(2u, entries().size()); @@ -997,7 +997,7 @@ TEST_F(LocalFileSystemOperationTest, TestRemoveFailure) { operation()->Remove(URLForPath(nonexisting_path), false /* recursive */, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status()); // It's an error to try to remove a non-empty directory if recursive flag @@ -1013,7 +1013,7 @@ TEST_F(LocalFileSystemOperationTest, TestRemoveFailure) { operation()->Remove(URLForPath(parent_dir_path), false /* recursive */, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_EMPTY, status()); EXPECT_TRUE(change_observer()->HasNoChange()); @@ -1025,7 +1025,7 @@ TEST_F(LocalFileSystemOperationTest, TestRemoveSuccess) { operation()->Remove(URLForPath(empty_dir_path), false /* recursive */, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_FALSE(DirectoryExists(empty_dir_path)); @@ -1044,7 +1044,7 @@ TEST_F(LocalFileSystemOperationTest, TestRemoveSuccess) { operation()->Remove(URLForPath(parent_dir_path), true /* recursive */, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_FALSE(DirectoryExists(parent_dir_path)); @@ -1068,7 +1068,7 @@ TEST_F(LocalFileSystemOperationTest, TestTruncate) { // Check that its length is the size of the data written. operation()->GetMetadata(URLForPath(file_path), RecordMetadataCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_FALSE(info().is_directory); EXPECT_EQ(data_size, info().size); @@ -1076,7 +1076,7 @@ TEST_F(LocalFileSystemOperationTest, TestTruncate) { // Extend the file by truncating it. int length = 17; operation()->Truncate(URLForPath(file_path), length, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count()); @@ -1100,7 +1100,7 @@ TEST_F(LocalFileSystemOperationTest, TestTruncate) { // Shorten the file by truncating it. length = 3; operation()->Truncate(URLForPath(file_path), length, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count()); @@ -1128,7 +1128,7 @@ TEST_F(LocalFileSystemOperationTest, TestTruncateFailureByQuota) { AddQuota(10); operation()->Truncate(URLForPath(file_path), 10, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count()); EXPECT_TRUE(change_observer()->HasNoChange()); @@ -1137,7 +1137,7 @@ TEST_F(LocalFileSystemOperationTest, TestTruncateFailureByQuota) { EXPECT_EQ(10, info.size); operation()->Truncate(URLForPath(file_path), 11, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, status()); EXPECT_TRUE(change_observer()->HasNoChange()); @@ -1166,7 +1166,7 @@ TEST_F(LocalFileSystemOperationTest, TestTouchFile) { operation()->TouchFile( URLForPath(file_path), new_accessed_time, new_modified_time, RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(change_observer()->HasNoChange()); @@ -1186,7 +1186,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateSnapshotFile) { RecordStatusCallback()); FilePath file_path(CreateUniqueFileInDir(dir_path)); operation()->FileExists(URLForPath(file_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); // See if we can get a 'snapshot' file info for the file. @@ -1195,7 +1195,7 @@ TEST_F(LocalFileSystemOperationTest, TestCreateSnapshotFile) { // as the file itself. operation()->CreateSnapshotFile(URLForPath(file_path), RecordSnapshotFileCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_FALSE(info().is_directory); EXPECT_EQ(PlatformPath(file_path), path()); diff --git a/webkit/fileapi/local_file_system_operation_write_unittest.cc b/webkit/fileapi/local_file_system_operation_write_unittest.cc index 6ba606d..4bf0ed0 100644 --- a/webkit/fileapi/local_file_system_operation_write_unittest.cc +++ b/webkit/fileapi/local_file_system_operation_write_unittest.cc @@ -313,7 +313,7 @@ TEST_F(LocalFileSystemOperationWriteTest, TestImmediateCancelSuccessfulWrite) { // We use RunAllPendings() instead of Run() here, because we won't dispatch // callbacks after Cancel() is issued (so no chance to Quit) nor do we need // to run another write cycle. - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Issued Cancel() before receiving any response from Write(), // so nothing should have happen. @@ -337,7 +337,7 @@ TEST_F(LocalFileSystemOperationWriteTest, TestImmediateCancelFailingWrite) { // We use RunAllPendings() instead of Run() here, because we won't dispatch // callbacks after Cancel() is issued (so no chance to Quit) nor do we need // to run another write cycle. - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Issued Cancel() before receiving any response from Write(), // so nothing should have happen. diff --git a/webkit/fileapi/local_file_system_quota_unittest.cc b/webkit/fileapi/local_file_system_quota_unittest.cc index e848afb..8ba84eb 100644 --- a/webkit/fileapi/local_file_system_quota_unittest.cc +++ b/webkit/fileapi/local_file_system_quota_unittest.cc @@ -96,7 +96,7 @@ class LocalFileSystemQuotaTest test_helper_.origin(), test_helper_.storage_type(), base::Bind(&LocalFileSystemQuotaTest::OnGetUsageAndQuota, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } bool FileExists(const FilePath& virtual_path) { @@ -243,7 +243,7 @@ TEST_F(LocalFileSystemQuotaTest, TestMoveSuccessSrcDirRecursive) { base::Bind(&AssertFileErrorEq, base::PLATFORM_FILE_OK)); operation()->Truncate(URLForPath(grandchild_file2_path_), 2, base::Bind(&AssertFileErrorEq, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 all_file_size = 5000 + 400 + 30 + 2; @@ -256,7 +256,7 @@ TEST_F(LocalFileSystemQuotaTest, TestMoveSuccessSrcDirRecursive) { operation()->Move(URLForPath(src_dir_path), URLForPath(dest_dir_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); EXPECT_TRUE(DirectoryExists(dest_dir_path.Append( @@ -291,7 +291,7 @@ TEST_F(LocalFileSystemQuotaTest, TestCopySuccessSrcDirRecursive) { base::Bind(&AssertFileErrorEq, base::PLATFORM_FILE_OK)); operation()->Truncate(URLForPath(grandchild_file2_path_), 5, base::Bind(&AssertFileErrorEq, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 child_file_size = 8000 + 700; const int64 grandchild_file_size = 60 + 5; @@ -307,7 +307,7 @@ TEST_F(LocalFileSystemQuotaTest, TestCopySuccessSrcDirRecursive) { operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_dir1_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); expected_usage += all_file_size + child_path_cost_ + grandchild_path_cost_; @@ -333,7 +333,7 @@ TEST_F(LocalFileSystemQuotaTest, TestCopySuccessSrcDirRecursive) { operation()->Copy(URLForPath(child_dir_path_), URLForPath(dest_dir2_path), RecordStatusCallback()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, status()); expected_usage += grandchild_file_size + grandchild_path_cost_; diff --git a/webkit/fileapi/local_file_system_test_helper.cc b/webkit/fileapi/local_file_system_test_helper.cc index 59a7d25..2de3aca3 100644 --- a/webkit/fileapi/local_file_system_test_helper.cc +++ b/webkit/fileapi/local_file_system_test_helper.cc @@ -105,7 +105,7 @@ void LocalFileSystemTestOriginHelper::SetUp( void LocalFileSystemTestOriginHelper::TearDown() { file_system_context_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } FilePath LocalFileSystemTestOriginHelper::GetOriginRootPath() const { diff --git a/webkit/fileapi/media/native_media_file_util_unittest.cc b/webkit/fileapi/media/native_media_file_util_unittest.cc index 6be9471..ff18801 100644 --- a/webkit/fileapi/media/native_media_file_util_unittest.cc +++ b/webkit/fileapi/media/native_media_file_util_unittest.cc @@ -174,7 +174,7 @@ TEST_F(NativeMediaFileUtilTest, DirectoryExistsAndFileExistsFiltering) { operation->DirectoryExists(url, base::Bind(&ExpectEqHelper, expectation)); else operation->FileExists(url, base::Bind(&ExpectEqHelper, expectation)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } } @@ -188,7 +188,7 @@ TEST_F(NativeMediaFileUtilTest, ReadDirectoryFiltering) { bool completed = false; NewOperation(url)->ReadDirectory( url, base::Bind(&DidReadDirectory, &content, &completed)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(completed); EXPECT_EQ(5u, content.size()); diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc index 0e5d1b7..349ee1c 100644 --- a/webkit/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/fileapi/obfuscated_file_util_unittest.cc @@ -215,7 +215,7 @@ class ObfuscatedFileUtilTest : public testing::Test { origin(), test_helper_.storage_type(), base::Bind(&ObfuscatedFileUtilTest::OnGetUsage, weak_factory_.GetWeakPtr())); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(quota::kQuotaStatusOk, quota_status_); } diff --git a/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc b/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc index cc54e8c..6535131 100644 --- a/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc +++ b/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc @@ -50,7 +50,7 @@ class LocalFileChangeTrackerTest : public testing::Test { sync_context_->ShutdownOnUIThread(); sync_context_ = NULL; - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); file_system_.TearDown(); // Make sure we don't leave the external filesystem. // (CannedSyncableFileSystem::TearDown does not do this as there may be diff --git a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc index a61c141d..4335fca 100644 --- a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc +++ b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc @@ -167,7 +167,7 @@ class LocalFileSyncContextTest : public testing::Test { base::PlatformFileError WaitUntilModifyFileIsDone() { while (!async_modify_finished_) - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); return file_error_; } diff --git a/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc b/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc index dfa00f1..d2d7d7c 100644 --- a/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc +++ b/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc @@ -70,7 +70,7 @@ class SyncableFileOperationRunnerTest : public testing::Test { sync_context_ = NULL; file_system_.TearDown(); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); RevokeSyncableFileSystem(kServiceName); } @@ -145,13 +145,13 @@ TEST_F(SyncableFileOperationRunnerTest, SimpleQueue) { file_system_.NewOperation()->Truncate( URL(kFile), 1, ExpectStatus(FROM_HERE, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, callback_count_); // Read operations are not blocked (and are executed before queued ones). file_system_.NewOperation()->FileExists( URL(kFile), ExpectStatus(FROM_HERE, base::PLATFORM_FILE_ERROR_NOT_FOUND)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, callback_count_); // End syncing (to enable write). @@ -159,14 +159,14 @@ TEST_F(SyncableFileOperationRunnerTest, SimpleQueue) { ASSERT_TRUE(sync_status()->IsWritable(URL(kFile))); ResetCallbackStatus(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(2, callback_count_); // Now the file must have been created and updated. ResetCallbackStatus(); file_system_.NewOperation()->FileExists( URL(kFile), ExpectStatus(FROM_HERE, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, callback_count_); } @@ -186,13 +186,13 @@ TEST_F(SyncableFileOperationRunnerTest, WriteToParentAndChild) { file_system_.NewOperation()->Remove( URL(kParent), true /* recursive */, ExpectStatus(FROM_HERE, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, callback_count_); // Read operations are not blocked (and are executed before queued ones). file_system_.NewOperation()->DirectoryExists( URL(kDir), ExpectStatus(FROM_HERE, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, callback_count_); // Writes to unrelated files must succeed as well. @@ -200,7 +200,7 @@ TEST_F(SyncableFileOperationRunnerTest, WriteToParentAndChild) { file_system_.NewOperation()->CreateDirectory( URL(kOther), false /* exclusive */, false /* recursive */, ExpectStatus(FROM_HERE, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, callback_count_); // End syncing (to enable write). @@ -208,7 +208,7 @@ TEST_F(SyncableFileOperationRunnerTest, WriteToParentAndChild) { ASSERT_TRUE(sync_status()->IsWritable(URL(kDir))); ResetCallbackStatus(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(2, callback_count_); } @@ -229,7 +229,7 @@ TEST_F(SyncableFileOperationRunnerTest, CopyAndMove) { file_system_.NewOperation()->Move( URL(kDir), URL("dest-move"), ExpectStatus(FROM_HERE, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, callback_count_); // Only "dest-copy1" should exist. @@ -246,13 +246,13 @@ TEST_F(SyncableFileOperationRunnerTest, CopyAndMove) { file_system_.NewOperation()->Copy( URL(kDir), URL("dest-copy2"), ExpectStatus(FROM_HERE, base::PLATFORM_FILE_OK)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, callback_count_); // Finish syncing the "dest-copy2" directory to unlock Copy. sync_status()->EndSyncing(URL("dest-copy2")); ResetCallbackStatus(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, callback_count_); // Now we should have "dest-copy2". @@ -262,7 +262,7 @@ TEST_F(SyncableFileOperationRunnerTest, CopyAndMove) { // Finish syncing the kParent to unlock Move. sync_status()->EndSyncing(URL(kParent)); ResetCallbackStatus(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, callback_count_); // Now we should have "dest-move". @@ -282,14 +282,14 @@ TEST_F(SyncableFileOperationRunnerTest, Write) { file_system_.NewOperation()->Write( &url_request_context_, URL(kFile), kBlobURL, 0, GetWriteCallback(FROM_HERE)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, callback_count_); sync_status()->EndSyncing(URL(kFile)); ResetCallbackStatus(); while (!write_complete_) - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(base::PLATFORM_FILE_OK, write_status_); EXPECT_EQ(kData.size(), write_bytes_); @@ -307,7 +307,7 @@ TEST_F(SyncableFileOperationRunnerTest, QueueAndCancel) { file_system_.NewOperation()->Truncate( URL(kFile), 1, ExpectStatus(FROM_HERE, base::PLATFORM_FILE_ERROR_ABORT)); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, callback_count_); ResetCallbackStatus(); @@ -315,7 +315,7 @@ TEST_F(SyncableFileOperationRunnerTest, QueueAndCancel) { // This shouldn't crash nor leak memory. sync_context_->ShutdownOnUIThread(); sync_context_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(2, callback_count_); } diff --git a/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc b/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc index f6a909c..b8d92f6 100644 --- a/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc +++ b/webkit/fileapi/syncable/syncable_file_system_util_unittest.cc @@ -139,7 +139,7 @@ TEST(SyncableFileSystemUtilTest, SerializeBeforeOpenFileSystem) { RevokeSyncableFileSystem(kServiceName); sync_context->ShutdownOnUIThread(); sync_context = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } } // namespace fileapi diff --git a/webkit/glue/cpp_bound_class_unittest.cc b/webkit/glue/cpp_bound_class_unittest.cc index 8937e2d..4fbe560a 100644 --- a/webkit/glue/cpp_bound_class_unittest.cc +++ b/webkit/glue/cpp_bound_class_unittest.cc @@ -121,7 +121,7 @@ class CppBoundClassTest : public testing::Test, public WebKit::WebFrameClient { html.append(javascript); html.append("</script></body></html>"); webframe()->loadHTMLString(html, GURL("about:blank")); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } // Executes the specified JavaScript and checks to be sure that the resulting diff --git a/webkit/glue/webkit_glue_unittest.cc b/webkit/glue/webkit_glue_unittest.cc index 3a830cfa..fb3a0ef 100644 --- a/webkit/glue/webkit_glue_unittest.cc +++ b/webkit/glue/webkit_glue_unittest.cc @@ -106,7 +106,7 @@ TEST(WebkitGlueTest, SuspendResumeSharedTimer) { platform_support.SuspendSharedTimer(); // The above timer would have posted a task which can be processed out of the // message loop. - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Set a mock time after 1 second to simulate timers suspended for 1 second. double new_time = base::Time::Now().ToDoubleT() + 1; platform_support.set_mock_monotonically_increasing_time(new_time); diff --git a/webkit/plugins/ppapi/quota_file_io_unittest.cc b/webkit/plugins/ppapi/quota_file_io_unittest.cc index 4a60db2..3e052a2 100644 --- a/webkit/plugins/ppapi/quota_file_io_unittest.cc +++ b/webkit/plugins/ppapi/quota_file_io_unittest.cc @@ -134,7 +134,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Write 8 bytes at offset 0 (-> length=8). std::string data("12345678"); Write(0, data, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(static_cast<int>(data.size()), bytes_written().front()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); @@ -155,7 +155,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Write 5 bytes at offset 5 (-> length=10). data = "55555"; Write(5, data, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(static_cast<int>(data.size()), bytes_written().front()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); @@ -174,7 +174,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Write 7 bytes at offset 8 (-> length=15). data = "9012345"; Write(8, data, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(static_cast<int>(data.size()), bytes_written().front()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); @@ -193,7 +193,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Write 2 bytes at offset 2 (-> length=15). data = "33"; Write(2, data, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(static_cast<int>(data.size()), bytes_written().front()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); @@ -211,7 +211,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Write 4 bytes at offset 20 (-> length=24). data = "XXXX"; Write(20, data, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(static_cast<int>(data.size()), bytes_written().front()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); @@ -232,7 +232,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Quota error case. Write 7 bytes at offset 23 (-> length is unchanged) data = "ABCDEFG"; Write(23, data, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, status().front()); EXPECT_EQ(5, quota_plugin_delegate()->available_space()); @@ -241,7 +241,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Overlapping write. Write 6 bytes at offset 2 (-> length is unchanged) data = "ABCDEF"; Write(2, data, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(static_cast<int>(data.size()), bytes_written().front()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); @@ -251,7 +251,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Overlapping + extending the file size, but within the quota. // Write 6 bytes at offset 23 (-> length=29). Write(23, data, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(static_cast<int>(data.size()), bytes_written().front()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); @@ -270,7 +270,7 @@ class QuotaFileIOTest : public PpapiUnittest { quota_plugin_delegate()->set_available_space(100); SetLength(0, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); EXPECT_EQ(0, GetPlatformFileSize()); @@ -278,7 +278,7 @@ class QuotaFileIOTest : public PpapiUnittest { reset_results(); SetLength(8, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); EXPECT_EQ(100 - 8, quota_plugin_delegate()->available_space()); @@ -292,7 +292,7 @@ class QuotaFileIOTest : public PpapiUnittest { } SetLength(16, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); EXPECT_EQ(100 - 16, quota_plugin_delegate()->available_space()); @@ -306,7 +306,7 @@ class QuotaFileIOTest : public PpapiUnittest { } SetLength(4, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); EXPECT_EQ(100 - 4, quota_plugin_delegate()->available_space()); @@ -320,7 +320,7 @@ class QuotaFileIOTest : public PpapiUnittest { } SetLength(0, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(base::PLATFORM_FILE_OK, status().front()); EXPECT_EQ(100, quota_plugin_delegate()->available_space()); @@ -337,7 +337,7 @@ class QuotaFileIOTest : public PpapiUnittest { // Quota error case. SetLength(7, will_operation); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(1U, num_results()); EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, status().front()); EXPECT_EQ(5, quota_plugin_delegate()->available_space()); @@ -458,7 +458,7 @@ TEST_F(QuotaFileIOTest, ParallelWrites) { Write(0, data1[0], false); Write(5, data1[1], false); Write(8, data1[2], false); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(ARRAYSIZE_UNSAFE(data1), num_results()); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data1); ++i) { @@ -479,7 +479,7 @@ TEST_F(QuotaFileIOTest, ParallelWrites) { }; Write(2, data2[0], false); Write(20, data2[1], false); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); ASSERT_EQ(ARRAYSIZE_UNSAFE(data2), num_results()); EXPECT_EQ(static_cast<int>(data2[0].size()), bytes_written().front()); diff --git a/webkit/quota/mock_quota_manager_unittest.cc b/webkit/quota/mock_quota_manager_unittest.cc index edd6642..c64138f 100644 --- a/webkit/quota/mock_quota_manager_unittest.cc +++ b/webkit/quota/mock_quota_manager_unittest.cc @@ -53,7 +53,7 @@ class MockQuotaManagerTest : public testing::Test { void TearDown() { // Make sure the quota manager cleans up correctly. manager_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } void GetModifiedOrigins(StorageType type, base::Time since) { @@ -162,7 +162,7 @@ TEST_F(MockQuotaManagerTest, OriginDeletion) { base::Time::Now()); DeleteOriginData(kOrigin2, kTemporary, kClientFile); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1, deletion_callback_count()); EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kTemporary, kClientFile)); @@ -172,7 +172,7 @@ TEST_F(MockQuotaManagerTest, OriginDeletion) { EXPECT_TRUE(manager()->OriginHasData(kOrigin3, kTemporary, kClientDB)); DeleteOriginData(kOrigin3, kTemporary, kClientFile | kClientDB); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(2, deletion_callback_count()); EXPECT_TRUE(manager()->OriginHasData(kOrigin1, kTemporary, kClientFile)); @@ -189,13 +189,13 @@ TEST_F(MockQuotaManagerTest, ModifiedOrigins) { base::TimeDelta a_minute = base::TimeDelta::FromMilliseconds(60000); GetModifiedOrigins(kTemporary, then); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(origins().empty()); manager()->AddOrigin(kOrigin1, kTemporary, kClientFile, now - an_hour); GetModifiedOrigins(kTemporary, then); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kTemporary, type()); EXPECT_EQ(1UL, origins().size()); @@ -205,7 +205,7 @@ TEST_F(MockQuotaManagerTest, ModifiedOrigins) { manager()->AddOrigin(kOrigin2, kTemporary, kClientFile, now); GetModifiedOrigins(kTemporary, then); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kTemporary, type()); EXPECT_EQ(2UL, origins().size()); @@ -213,7 +213,7 @@ TEST_F(MockQuotaManagerTest, ModifiedOrigins) { EXPECT_EQ(1UL, origins().count(kOrigin2)); GetModifiedOrigins(kTemporary, now - a_minute); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kTemporary, type()); EXPECT_EQ(1UL, origins().size()); diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc index 4e05604..49476d0 100644 --- a/webkit/quota/quota_manager_unittest.cc +++ b/webkit/quota/quota_manager_unittest.cc @@ -70,7 +70,7 @@ class QuotaManagerTest : public testing::Test { void TearDown() { // Make sure the quota manager cleans up correctly. quota_manager_ = NULL; - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } protected: @@ -451,7 +451,7 @@ TEST_F(QuotaManagerTest, GetUsageInfo) { QuotaClient::kDatabase)); GetUsageInfo(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(4U, usage_info().size()); for (size_t i = 0; i < usage_info().size(); ++i) { @@ -480,20 +480,20 @@ TEST_F(QuotaManagerTest, GetUsageAndQuota_Simple) { QuotaClient::kFileSystem)); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(80, usage()); EXPECT_EQ(0, quota()); GetUsageAndQuota(GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10, usage()); EXPECT_LE(0, quota()); int64 quota_returned_for_foo = quota(); GetUsageAndQuota(GURL("http://bar.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(0, usage()); EXPECT_EQ(quota_returned_for_foo, quota()); @@ -501,30 +501,30 @@ TEST_F(QuotaManagerTest, GetUsageAndQuota_Simple) { TEST_F(QuotaManagerTest, GetUsage_NoClient) { GetUsageAndQuota(GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(0, usage()); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(0, usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, usage()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, usage()); EXPECT_EQ(0, unlimited_usage()); GetGlobalUsage(kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, usage()); EXPECT_EQ(0, unlimited_usage()); } @@ -532,30 +532,30 @@ TEST_F(QuotaManagerTest, GetUsage_NoClient) { TEST_F(QuotaManagerTest, GetUsage_EmptyClient) { RegisterClient(CreateClient(NULL, 0, QuotaClient::kFileSystem)); GetUsageAndQuota(GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(0, usage()); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(0, usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, usage()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, usage()); EXPECT_EQ(0, unlimited_usage()); GetGlobalUsage(kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, usage()); EXPECT_EQ(0, unlimited_usage()); } @@ -574,13 +574,13 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_MultiOrigins) { // This time explicitly sets a temporary global quota. SetTemporaryGlobalQuota(100); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kTemp, type()); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(100, quota()); GetUsageAndQuota(GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20, usage()); @@ -591,7 +591,7 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_MultiOrigins) { EXPECT_EQ(kPerHostQuota, quota()); GetUsageAndQuota(GURL("http://bar.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(5 + 7, usage()); EXPECT_EQ(kPerHostQuota, quota()); @@ -619,52 +619,52 @@ TEST_F(QuotaManagerTest, GetUsage_MultipleClients) { QuotaClient::kDatabase)); GetUsageAndQuota(GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 30, usage()); GetUsageAndQuota(GURL("http://bar.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(50, usage()); GetUsageAndQuota(GURL("http://unlimited/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(1, usage()); EXPECT_EQ(QuotaManager::kNoLimit, quota()); GetUsageAndQuota(GURL("http://unlimited/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(1, usage()); EXPECT_EQ(QuotaManager::kNoLimit, quota()); GetAvailableSpace(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_LE(0, available_space()); GetUsageAndQuota(GURL("http://installed/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(1, usage()); EXPECT_EQ(available_space(), quota()); GetUsageAndQuota(GURL("http://installed/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(1, usage()); EXPECT_EQ(available_space(), quota()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20 + 30 + 1 + 1, usage()); EXPECT_EQ(2, unlimited_usage()); GetGlobalUsage(kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(40 + 50 + 1 + 1, usage()); EXPECT_EQ(2, unlimited_usage()); @@ -680,7 +680,7 @@ void QuotaManagerTest::GetUsage_WithModifyTestBody(const StorageType type) { RegisterClient(client); GetUsageAndQuota(GURL("http://foo.com/"), type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20, usage()); @@ -689,19 +689,19 @@ void QuotaManagerTest::GetUsage_WithModifyTestBody(const StorageType type) { client->AddOriginAndNotify(GURL("https://foo.com/"), type, 1); GetUsageAndQuota(GURL("http://foo.com/"), type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20 + 30 - 5 + 1, usage()); int foo_usage = usage(); client->AddOriginAndNotify(GURL("http://bar.com/"), type, 40); GetUsageAndQuota(GURL("http://bar.com/"), type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(40, usage()); GetGlobalUsage(type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(foo_usage + 40, usage()); EXPECT_EQ(0, unlimited_usage()); } @@ -720,14 +720,14 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_WithAdditionalTasks) { RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData), QuotaClient::kFileSystem)); SetTemporaryGlobalQuota(100); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int kPerHostQuota = 100 / QuotaManager::kPerHostTemporaryPortion; GetUsageAndQuota(GURL("http://foo.com/"), kTemp); GetUsageAndQuota(GURL("http://foo.com/"), kTemp); GetUsageAndQuota(GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20, usage()); EXPECT_EQ(kPerHostQuota, quota()); @@ -737,7 +737,7 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_WithAdditionalTasks) { kTemp); GetUsageAndQuota(GURL("http://foo.com/"), kTemp); RunAdditionalUsageAndQuotaTask(GURL("http://bar.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20, usage()); EXPECT_EQ(kPerHostQuota, quota()); @@ -754,7 +754,7 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_NukeManager) { RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData), QuotaClient::kFileSystem)); SetTemporaryGlobalQuota(100); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); set_additional_callback_count(0); GetUsageAndQuota(GURL("http://foo.com/"), kTemp); @@ -768,7 +768,7 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_NukeManager) { // Nuke before waiting for callbacks. set_quota_manager(NULL); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaErrorAbort, status()); } @@ -781,24 +781,24 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_Overbudget) { RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData), QuotaClient::kFileSystem)); SetTemporaryGlobalQuota(100); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int kPerHostQuota = 100 / QuotaManager::kPerHostTemporaryPortion; GetUsageAndQuota(GURL("http://usage1/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(1, usage()); EXPECT_EQ(1, quota()); // should be clamped to our current usage GetUsageAndQuota(GURL("http://usage10/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10, usage()); EXPECT_EQ(10, quota()); GetUsageAndQuota(GURL("http://usage200/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(200, usage()); EXPECT_EQ(kPerHostQuota, quota()); // should be clamped to the nominal quota @@ -817,10 +817,10 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_Unlimited) { // Test when not overbugdet. SetTemporaryGlobalQuota(1000); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(10 + 50 + 4000, usage()); EXPECT_EQ(4000, unlimited_usage()); @@ -828,44 +828,44 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_Unlimited) { 1000 / QuotaManager::kPerHostTemporaryPortion; GetUsageAndQuota(GURL("http://usage10/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10, usage()); EXPECT_EQ(kPerHostQuotaFor1000, quota()); GetUsageAndQuota(GURL("http://usage50/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(50, usage()); EXPECT_EQ(kPerHostQuotaFor1000, quota()); GetUsageAndQuota(GURL("http://unlimited/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(4000, usage()); EXPECT_EQ(QuotaManager::kNoLimit, quota()); // Test when overbugdet. SetTemporaryGlobalQuota(100); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int kPerHostQuotaFor100 = 100 / QuotaManager::kPerHostTemporaryPortion; GetUsageAndQuota(GURL("http://usage10/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10, usage()); EXPECT_EQ(kPerHostQuotaFor100, quota()); GetUsageAndQuota(GURL("http://usage50/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(50, usage()); EXPECT_EQ(kPerHostQuotaFor100, quota()); GetUsageAndQuota(GURL("http://unlimited/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(4000, usage()); EXPECT_EQ(QuotaManager::kNoLimit, quota()); @@ -875,24 +875,24 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_Unlimited) { mock_special_storage_policy()->NotifyChanged(); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(10 + 50 + 4000, usage()); EXPECT_EQ(0, unlimited_usage()); GetUsageAndQuota(GURL("http://usage10/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10, usage()); EXPECT_EQ(10, quota()); // should be clamped to our current usage GetUsageAndQuota(GURL("http://usage50/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(50, usage()); EXPECT_EQ(kPerHostQuotaFor100, quota()); GetUsageAndQuota(GURL("http://unlimited/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(4000, usage()); EXPECT_EQ(kPerHostQuotaFor100, quota()); @@ -924,11 +924,11 @@ TEST_F(QuotaManagerTest, GetAndSetPerststentHostQuota) { RegisterClient(CreateClient(NULL, 0, QuotaClient::kFileSystem)); GetPersistentHostQuota("foo.com"); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(0, quota()); SetPersistentHostQuota("foo.com", 100); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(100, quota()); GetPersistentHostQuota("foo.com"); @@ -936,7 +936,7 @@ TEST_F(QuotaManagerTest, GetAndSetPerststentHostQuota) { GetPersistentHostQuota("foo.com"); SetPersistentHostQuota("foo.com", 300000000000ll); GetPersistentHostQuota("foo.com"); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(300000000000ll, quota()); } @@ -944,14 +944,14 @@ TEST_F(QuotaManagerTest, GetAndSetPersistentUsageAndQuota) { RegisterClient(CreateClient(NULL, 0, QuotaClient::kFileSystem)); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(0, usage()); EXPECT_EQ(0, quota()); SetPersistentHostQuota("foo.com", 100); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(0, usage()); EXPECT_EQ(100, quota()); @@ -973,7 +973,7 @@ TEST_F(QuotaManagerTest, GetPersistentUsageAndQuota_MultiOrigins) { SetPersistentHostQuota("foo.com", 100); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20 + 13 + 19, usage()); EXPECT_EQ(100, quota()); @@ -997,7 +997,7 @@ TEST_F(QuotaManagerTest, GetPersistentUsageAndQuota_WithAdditionalTasks) { GetUsageAndQuota(GURL("http://foo.com/"), kPerm); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20, usage()); EXPECT_EQ(100, quota()); @@ -1007,7 +1007,7 @@ TEST_F(QuotaManagerTest, GetPersistentUsageAndQuota_WithAdditionalTasks) { kPerm); GetUsageAndQuota(GURL("http://foo.com/"), kPerm); RunAdditionalUsageAndQuotaTask(GURL("http://bar.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(10 + 20, usage()); EXPECT_EQ(2, additional_callback_count()); @@ -1031,7 +1031,7 @@ TEST_F(QuotaManagerTest, GetPersistentUsageAndQuota_NukeManager) { // Nuke before waiting for callbacks. set_quota_manager(NULL); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaErrorAbort, status()); } @@ -1049,21 +1049,21 @@ TEST_F(QuotaManagerTest, GetUsage_Simple) { QuotaClient::kFileSystem)); GetGlobalUsage(kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 1 + 20 + 600000); EXPECT_EQ(0, unlimited_usage()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 300 + 4000 + 50000 + 7000000); EXPECT_EQ(0, unlimited_usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 1 + 20); GetHostUsage("buz.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 4000 + 50000); } @@ -1083,7 +1083,7 @@ TEST_F(QuotaManagerTest, GetUsage_WithModification) { RegisterClient(client); GetGlobalUsage(kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 1 + 20 + 600000); EXPECT_EQ(0, unlimited_usage()); @@ -1091,12 +1091,12 @@ TEST_F(QuotaManagerTest, GetUsage_WithModification) { GURL("http://foo.com/"), kPerm, 80000000); GetGlobalUsage(kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 1 + 20 + 600000 + 80000000); EXPECT_EQ(0, unlimited_usage()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 300 + 4000 + 50000 + 7000000); EXPECT_EQ(0, unlimited_usage()); @@ -1104,19 +1104,19 @@ TEST_F(QuotaManagerTest, GetUsage_WithModification) { GURL("http://foo.com/"), kTemp, 1); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 300 + 4000 + 50000 + 7000000 + 1); EXPECT_EQ(0, unlimited_usage()); GetHostUsage("buz.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 4000 + 50000); client->ModifyOriginAndNotify( GURL("http://buz.com/"), kTemp, 900000000); GetHostUsage("buz.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(usage(), 4000 + 50000 + 900000000); } @@ -1132,38 +1132,38 @@ TEST_F(QuotaManagerTest, GetUsage_WithDeleteOrigin) { RegisterClient(client); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_global_tmp = usage(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_host_tmp = usage(); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_host_pers = usage(); DeleteClientOriginData(client, GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_global_tmp - 1, usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_tmp - 1, usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_pers, usage()); } TEST_F(QuotaManagerTest, GetAvailableSpaceTest) { GetAvailableSpace(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_LE(0, available_space()); } @@ -1190,15 +1190,15 @@ TEST_F(QuotaManagerTest, EvictOriginData) { RegisterClient(client2); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_global_tmp = usage(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_host_tmp = usage(); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_host_pers = usage(); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData1); ++i) @@ -1207,13 +1207,13 @@ TEST_F(QuotaManagerTest, EvictOriginData) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData2); ++i) quota_manager()->NotifyStorageAccessed(QuotaClient::kUnknown, GURL(kData2[i].origin), kData2[i].type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EvictOriginData(GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); DumpOriginInfoTable(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); typedef OriginInfoTableEntries::const_iterator iterator; for (iterator itr(origin_info_entries().begin()), @@ -1224,15 +1224,15 @@ TEST_F(QuotaManagerTest, EvictOriginData) { } GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_global_tmp - (1 + 50000), usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_tmp - (1 + 50000), usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_pers, usage()); } @@ -1249,20 +1249,20 @@ TEST_F(QuotaManagerTest, EvictOriginDataWithDeletionError) { RegisterClient(client); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_global_tmp = usage(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_host_tmp = usage(); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_host_pers = usage(); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData); ++i) NotifyStorageAccessed(client, GURL(kData[i].origin), kData[i].type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); client->AddOriginToErrorSet(GURL("http://foo.com/"), kTemp); @@ -1270,12 +1270,12 @@ TEST_F(QuotaManagerTest, EvictOriginDataWithDeletionError) { i < QuotaManager::kThresholdOfErrorsToBeBlacklisted + 1; ++i) { EvictOriginData(GURL("http://foo.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaErrorInvalidModification, status()); } DumpOriginInfoTable(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); bool found_origin_in_database = false; typedef OriginInfoTableEntries::const_iterator iterator; @@ -1293,31 +1293,31 @@ TEST_F(QuotaManagerTest, EvictOriginDataWithDeletionError) { for (size_t i = 0; i < kNumberOfTemporaryOrigins - 1; ++i) { GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_FALSE(lru_origin().is_empty()); // The origin "http://foo.com/" should not be in the LRU list. EXPECT_NE(std::string("http://foo.com/"), lru_origin().spec()); DeleteOriginFromDatabase(lru_origin(), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } // Now the LRU list must be empty. GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(lru_origin().is_empty()); // Deleting origins from the database should not affect the results of the // following checks. GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_global_tmp, usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_tmp, usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_pers, usage()); } @@ -1335,10 +1335,10 @@ TEST_F(QuotaManagerTest, GetUsageAndQuotaForEviction) { RegisterClient(client); SetTemporaryGlobalQuota(10000000); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetUsageAndQuotaForEviction(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(4021, usage()); EXPECT_EQ(4000, unlimited_usage()); @@ -1355,47 +1355,47 @@ TEST_F(QuotaManagerTest, DeleteHostDataSimple) { RegisterClient(client); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_global_tmp = usage(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_host_tmp = usage(); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); int64 predelete_host_pers = usage(); DeleteHostData("", kTemp, kAllClients); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_global_tmp, usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_tmp, usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_pers, usage()); DeleteHostData("foo.com", kTemp, kAllClients); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_global_tmp - 1, usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_tmp - 1, usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_host_pers, usage()); } @@ -1421,35 +1421,35 @@ TEST_F(QuotaManagerTest, DeleteHostDataMultiple) { RegisterClient(client2); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_global_tmp = usage(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_foo_tmp = usage(); GetHostUsage("bar.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_bar_tmp = usage(); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_foo_pers = usage(); GetHostUsage("bar.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_bar_pers = usage(); reset_status_callback_count(); DeleteHostData("foo.com", kTemp, kAllClients); DeleteHostData("bar.com", kTemp, kAllClients); DeleteHostData("foo.com", kTemp, kAllClients); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(3, status_callback_count()); DumpOriginInfoTable(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); typedef OriginInfoTableEntries::const_iterator iterator; for (iterator itr(origin_info_entries().begin()), @@ -1464,24 +1464,24 @@ TEST_F(QuotaManagerTest, DeleteHostDataMultiple) { } GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ( predelete_global_tmp - (1 + 20 + 4000 + 50000 + 6000 + 80 + 9), usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - (1 + 20 + 50000 + 6000 + 80), usage()); GetHostUsage("bar.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_bar_tmp - (4000 + 9), usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_pers, usage()); GetHostUsage("bar.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_bar_pers, usage()); } @@ -1509,23 +1509,23 @@ TEST_F(QuotaManagerTest, DeleteOriginDataMultiple) { RegisterClient(client2); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_global_tmp = usage(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_foo_tmp = usage(); GetHostUsage("bar.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_bar_tmp = usage(); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_foo_pers = usage(); GetHostUsage("bar.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_bar_pers = usage(); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData1); ++i) @@ -1534,18 +1534,18 @@ TEST_F(QuotaManagerTest, DeleteOriginDataMultiple) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData2); ++i) quota_manager()->NotifyStorageAccessed(QuotaClient::kUnknown, GURL(kData2[i].origin), kData2[i].type); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); reset_status_callback_count(); DeleteOriginData(GURL("http://foo.com/"), kTemp, kAllClients); DeleteOriginData(GURL("http://bar.com/"), kTemp, kAllClients); DeleteOriginData(GURL("http://foo.com/"), kTemp, kAllClients); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(3, status_callback_count()); DumpOriginInfoTable(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); typedef OriginInfoTableEntries::const_iterator iterator; for (iterator itr(origin_info_entries().begin()), @@ -1558,23 +1558,23 @@ TEST_F(QuotaManagerTest, DeleteOriginDataMultiple) { } GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_global_tmp - (1 + 4000 + 50000 + 9), usage()); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - (1 + 50000), usage()); GetHostUsage("bar.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_bar_tmp - (4000 + 9), usage()); GetHostUsage("foo.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_pers, usage()); GetHostUsage("bar.com", kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_bar_pers, usage()); } @@ -1598,12 +1598,12 @@ TEST_F(QuotaManagerTest, GetCachedOrigins) { // No matter how we make queries the quota manager tries to cache all // the origins at startup. GetHostUsage("a.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetCachedOrigins(kTemp, &origins); EXPECT_EQ(3U, origins.size()); GetHostUsage("b.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetCachedOrigins(kTemp, &origins); EXPECT_EQ(3U, origins.size()); @@ -1611,7 +1611,7 @@ TEST_F(QuotaManagerTest, GetCachedOrigins) { EXPECT_TRUE(origins.empty()); GetGlobalUsage(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetCachedOrigins(kTemp, &origins); EXPECT_EQ(3U, origins.size()); @@ -1635,29 +1635,29 @@ TEST_F(QuotaManagerTest, NotifyAndLRUOrigin) { GURL origin; GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(lru_origin().is_empty()); NotifyStorageAccessed(client, GURL("http://a.com/"), kTemp); GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ("http://a.com/", lru_origin().spec()); NotifyStorageAccessed(client, GURL("http://b.com/"), kPerm); NotifyStorageAccessed(client, GURL("https://a.com/"), kTemp); NotifyStorageAccessed(client, GURL("http://c.com/"), kTemp); GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ("http://a.com/", lru_origin().spec()); DeleteOriginFromDatabase(lru_origin(), kTemp); GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ("https://a.com/", lru_origin().spec()); DeleteOriginFromDatabase(lru_origin(), kTemp); GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ("http://c.com/", lru_origin().spec()); } @@ -1675,7 +1675,7 @@ TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) { GURL origin; GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(lru_origin().is_empty()); NotifyStorageAccessed(client, GURL("http://a.com/"), kTemp); @@ -1684,19 +1684,19 @@ TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) { NotifyStorageAccessed(client, GURL("http://c.com/"), kTemp); GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ("http://a.com/", lru_origin().spec()); // Notify origin http://a.com is in use. NotifyOriginInUse(GURL("http://a.com/")); GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ("https://a.com/", lru_origin().spec()); // Notify origin https://a.com is in use while GetLRUOrigin is running. GetLRUOrigin(kTemp); NotifyOriginInUse(GURL("https://a.com/")); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Post-filtering must have excluded the returned origin, so we will // see empty result here. EXPECT_TRUE(lru_origin().is_empty()); @@ -1704,7 +1704,7 @@ TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) { // Notify access for http://c.com while GetLRUOrigin is running. GetLRUOrigin(kTemp); NotifyStorageAccessed(client, GURL("http://c.com/"), kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Post-filtering must have excluded the returned origin, so we will // see empty result here. EXPECT_TRUE(lru_origin().is_empty()); @@ -1712,7 +1712,7 @@ TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) { NotifyOriginNoLongerInUse(GURL("http://a.com/")); NotifyOriginNoLongerInUse(GURL("https://a.com/")); GetLRUOrigin(kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ("http://a.com/", lru_origin().spec()); } @@ -1729,7 +1729,7 @@ TEST_F(QuotaManagerTest, GetOriginsModifiedSince) { RegisterClient(client); GetOriginsModifiedSince(kTemp, base::Time()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(modified_origins().empty()); EXPECT_EQ(modified_origins_type(), kTemp); @@ -1743,7 +1743,7 @@ TEST_F(QuotaManagerTest, GetOriginsModifiedSince) { base::Time time3 = client->IncrementMockTime(); GetOriginsModifiedSince(kTemp, time1); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(4U, modified_origins().size()); EXPECT_EQ(modified_origins_type(), kTemp); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData); ++i) { @@ -1752,18 +1752,18 @@ TEST_F(QuotaManagerTest, GetOriginsModifiedSince) { } GetOriginsModifiedSince(kTemp, time2); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(2U, modified_origins().size()); GetOriginsModifiedSince(kTemp, time3); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_TRUE(modified_origins().empty()); EXPECT_EQ(modified_origins_type(), kTemp); client->ModifyOriginAndNotify(GURL("http://a.com/"), kTemp, 10); GetOriginsModifiedSince(kTemp, time3); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(1U, modified_origins().size()); EXPECT_EQ(1U, modified_origins().count(GURL("http://a.com/"))); EXPECT_EQ(modified_origins_type(), kTemp); @@ -1773,10 +1773,10 @@ TEST_F(QuotaManagerTest, DumpQuotaTable) { SetPersistentHostQuota("example1.com", 1); SetPersistentHostQuota("example2.com", 20); SetPersistentHostQuota("example3.com", 300); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); DumpQuotaTable(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const QuotaTableEntry kEntries[] = { QuotaTableEntry("example1.com", kPerm, 1), @@ -1812,10 +1812,10 @@ TEST_F(QuotaManagerTest, DumpOriginInfoTable) { QuotaClient::kUnknown, GURL("http://example.com/"), kPerm); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); DumpOriginInfoTable(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); typedef std::pair<GURL, StorageType> TypedOrigin; typedef std::pair<TypedOrigin, int> Entry; @@ -1843,12 +1843,12 @@ TEST_F(QuotaManagerTest, DumpOriginInfoTable) { TEST_F(QuotaManagerTest, QuotaForEmptyHost) { GetPersistentHostQuota(std::string()); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaStatusOk, status()); EXPECT_EQ(0, quota()); SetPersistentHostQuota(std::string(), 10); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(kQuotaErrorNotSupported, status()); } @@ -1879,32 +1879,32 @@ TEST_F(QuotaManagerTest, DeleteSpecificClientTypeSingleOrigin) { RegisterClient(client4); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_foo_tmp = usage(); DeleteOriginData(GURL("http://foo.com/"), kTemp, QuotaClient::kFileSystem); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 1, usage()); DeleteOriginData(GURL("http://foo.com/"), kTemp, QuotaClient::kAppcache); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 2 - 1, usage()); DeleteOriginData(GURL("http://foo.com/"), kTemp, QuotaClient::kDatabase); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 4 - 2 - 1, usage()); DeleteOriginData(GURL("http://foo.com/"), kTemp, QuotaClient::kIndexedDatabase); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage()); } @@ -1935,31 +1935,31 @@ TEST_F(QuotaManagerTest, DeleteSpecificClientTypeSingleHost) { RegisterClient(client4); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_foo_tmp = usage(); DeleteHostData("foo.com", kTemp, QuotaClient::kFileSystem); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 1, usage()); DeleteHostData("foo.com", kTemp, QuotaClient::kAppcache); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 2 - 1, usage()); DeleteHostData("foo.com", kTemp, QuotaClient::kDatabase); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 4 - 2 - 1, usage()); DeleteHostData("foo.com", kTemp, QuotaClient::kIndexedDatabase); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage()); } @@ -1990,21 +1990,21 @@ TEST_F(QuotaManagerTest, DeleteMultipleClientTypesSingleOrigin) { RegisterClient(client4); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_foo_tmp = usage(); DeleteOriginData(GURL("http://foo.com/"), kTemp, QuotaClient::kFileSystem | QuotaClient::kDatabase); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 4 - 1, usage()); DeleteOriginData(GURL("http://foo.com/"), kTemp, QuotaClient::kAppcache | QuotaClient::kIndexedDatabase); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage()); } @@ -2035,21 +2035,21 @@ TEST_F(QuotaManagerTest, DeleteMultipleClientTypesSingleHost) { RegisterClient(client4); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); const int64 predelete_foo_tmp = usage(); DeleteHostData("foo.com", kTemp, QuotaClient::kFileSystem | QuotaClient::kAppcache); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 2 - 1, usage()); DeleteHostData("foo.com", kTemp, QuotaClient::kDatabase | QuotaClient::kIndexedDatabase); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); GetHostUsage("foo.com", kTemp); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage()); } } // namespace quota diff --git a/webkit/quota/quota_temporary_storage_evictor_unittest.cc b/webkit/quota/quota_temporary_storage_evictor_unittest.cc index 756c627..21c1cf9 100644 --- a/webkit/quota/quota_temporary_storage_evictor_unittest.cc +++ b/webkit/quota/quota_temporary_storage_evictor_unittest.cc @@ -148,7 +148,7 @@ class QuotaTemporaryStorageEvictorTest : public testing::Test { void SetUp() { quota_eviction_handler_.reset(new MockQuotaEvictionHandler(this)); - // Run multiple evictions in a single RunAllPending() when interval_ms == 0 + // Run multiple evictions in a single RunUntilIdle() when interval_ms == 0 temporary_storage_evictor_.reset(new QuotaTemporaryStorageEvictor( quota_eviction_handler_.get(), 0)); } @@ -156,7 +156,7 @@ class QuotaTemporaryStorageEvictorTest : public testing::Test { void TearDown() { temporary_storage_evictor_.reset(); quota_eviction_handler_.reset(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } void TaskForRepeatedEvictionTest( @@ -240,7 +240,7 @@ TEST_F(QuotaTemporaryStorageEvictorTest, SimpleEvictionTest) { EXPECT_EQ(3000 + 200 + 500, quota_eviction_handler()->GetUsage()); set_repeated_eviction(false); temporary_storage_evictor()->Start(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(200 + 500, quota_eviction_handler()->GetUsage()); EXPECT_EQ(0, statistics().num_errors_on_evicting_origin); @@ -260,7 +260,7 @@ TEST_F(QuotaTemporaryStorageEvictorTest, MultipleEvictionTest) { EXPECT_EQ(20 + 2900 + 450 + 400, quota_eviction_handler()->GetUsage()); set_repeated_eviction(false); temporary_storage_evictor()->Start(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(450 + 400, quota_eviction_handler()->GetUsage()); EXPECT_EQ(0, statistics().num_errors_on_evicting_origin); @@ -292,7 +292,7 @@ TEST_F(QuotaTemporaryStorageEvictorTest, RepeatedEvictionTest) { initial_total_size - d_size + e_size - c_size)); EXPECT_EQ(initial_total_size, quota_eviction_handler()->GetUsage()); temporary_storage_evictor()->Start(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(initial_total_size - d_size + e_size - c_size - b_size, quota_eviction_handler()->GetUsage()); EXPECT_EQ(5, num_get_usage_and_quota_for_eviction()); @@ -324,7 +324,7 @@ TEST_F(QuotaTemporaryStorageEvictorTest, RepeatedEvictionSkippedTest) { EXPECT_EQ(initial_total_size, quota_eviction_handler()->GetUsage()); set_repeated_eviction(true); temporary_storage_evictor()->Start(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(initial_total_size - d_size, quota_eviction_handler()->GetUsage()); EXPECT_EQ(4, num_get_usage_and_quota_for_eviction()); @@ -359,7 +359,7 @@ TEST_F(QuotaTemporaryStorageEvictorTest, RepeatedEvictionWithAccessOriginTest) { initial_total_size - d_size + e_size - b_size)); EXPECT_EQ(initial_total_size, quota_eviction_handler()->GetUsage()); temporary_storage_evictor()->Start(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(initial_total_size - d_size + e_size - b_size - a_size, quota_eviction_handler()->GetUsage()); EXPECT_EQ(5, num_get_usage_and_quota_for_eviction()); @@ -381,7 +381,7 @@ TEST_F(QuotaTemporaryStorageEvictorTest, DiskSpaceNonEvictionTest) { reset_min_available_disk_space_to_start_eviction(); set_repeated_eviction(false); temporary_storage_evictor()->Start(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(414 + 450, quota_eviction_handler()->GetUsage()); EXPECT_EQ(0, statistics().num_errors_on_evicting_origin); @@ -404,7 +404,7 @@ TEST_F(QuotaTemporaryStorageEvictorTest, DiskSpaceEvictionTest) { default_min_available_disk_space_to_start_eviction()); set_repeated_eviction(false); temporary_storage_evictor()->Start(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); EXPECT_EQ(150 + 300, quota_eviction_handler()->GetUsage()); EXPECT_EQ(0, statistics().num_errors_on_evicting_origin); @@ -424,7 +424,7 @@ TEST_F(QuotaTemporaryStorageEvictorTest, UnlimitedExclusionEvictionTest) { EXPECT_EQ(3000 + 200 + 500000, quota_eviction_handler()->GetUsage()); set_repeated_eviction(false); temporary_storage_evictor()->Start(); - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); // Nothing should have been evicted. EXPECT_EQ(3000 + 200 + 500000, quota_eviction_handler()->GetUsage()); } diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 04a6fbb..94a1c8f 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -362,7 +362,7 @@ void SetUpTestEnvironmentForUnitTests( void TearDownTestEnvironment() { // Flush any remaining messages before we kill ourselves. // http://code.google.com/p/chromium/issues/detail?id=9500 - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); BeforeShutdown(); if (RunningOnValgrind()) @@ -562,7 +562,7 @@ void QuitMessageLoopNow() { } void RunAllPendingMessages() { - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } bool MessageLoopNestableTasksAllowed() { @@ -576,7 +576,7 @@ void MessageLoopSetNestableTasksAllowed(bool allowed) { void DispatchMessageLoop() { MessageLoop* current = MessageLoop::current(); MessageLoop::ScopedNestableTaskAllower allow(current); - current->RunAllPending(); + current->RunUntilIdle(); } WebDevToolsAgentClient::WebKitClientMessageLoop* CreateDevToolsMessageLoop() { diff --git a/webkit/tools/test_shell/test_shell_test.cc b/webkit/tools/test_shell/test_shell_test.cc index c3dab8e..16357f2 100644 --- a/webkit/tools/test_shell/test_shell_test.cc +++ b/webkit/tools/test_shell/test_shell_test.cc @@ -42,7 +42,7 @@ void TestShellTest::TearDown() { test_shell_->DestroyWindow(test_shell_->mainWnd()); // Flush the MessageLoop of any residual tasks. - MessageLoop::current()->RunAllPending(); + MessageLoop::current()->RunUntilIdle(); } void TestShellTest::CreateEmptyWindow() { |