Simplify RunTaskOnThread

chrome/browser/chromeos/drive/file_cache_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/file_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback_helpers.h"
@@ skipping 363 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, metadata_storage_->GetEntry(id, &entry));
   EXPECT_TRUE(entry.file_specific_info().cache_state().is_dirty());
 
   // Open (2).
   scoped_ptr<base::ScopedClosureRunner> file_closer2;
   EXPECT_EQ(FILE_ERROR_OK, cache_->OpenForWrite(id, &file_closer2));
   EXPECT_TRUE(cache_->IsOpenedForWrite(id));
 
   // Close (1).
   file_closer1.reset();
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(cache_->IsOpenedForWrite(id));
 
   // last_modified is updated.
   EXPECT_EQ(FILE_ERROR_OK, metadata_storage_->GetEntry(id, &entry));
   EXPECT_NE(0, entry.file_info().last_modified());
 
   // Close (2).
   file_closer2.reset();
+  base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(cache_->IsOpenedForWrite(id));
 
   // Try to open non-existent file.
   EXPECT_EQ(FILE_ERROR_NOT_FOUND,
             cache_->OpenForWrite("nonexistent_id", &file_closer1));
 }
 
 TEST_F(FileCacheTest, UpdateMd5) {
   // Store test data.
   const base::FilePath src_file_path = temp_dir_.path().Append("test.dat");
@@ skipping 15 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, cache_->GetFile(id, &cache_file_path));
   const std::string contents_after = "after";
   EXPECT_TRUE(google_apis::test_util::WriteStringToFile(cache_file_path,
                                                         contents_after));
 
   // Cannot update MD5 of an opend file.
   EXPECT_EQ(FILE_ERROR_IN_USE, cache_->UpdateMd5(id));
 
   // Close file.
   file_closer.reset();
+  base::RunLoop().RunUntilIdle();
 
   // MD5 was cleared by OpenForWrite().
   EXPECT_EQ(FILE_ERROR_OK, metadata_storage_->GetEntry(id, &entry));
   EXPECT_TRUE(entry.file_specific_info().cache_state().md5().empty());
 
   // Update MD5.
   EXPECT_EQ(FILE_ERROR_OK, cache_->UpdateMd5(id));
   EXPECT_EQ(FILE_ERROR_OK, metadata_storage_->GetEntry(id, &entry));
   EXPECT_EQ(base::MD5String(contents_after),
             entry.file_specific_info().cache_state().md5());
@@ skipping 17 matching lines @@
 
   // Entry is dirty.
   EXPECT_EQ(FILE_ERROR_OK, metadata_storage_->GetEntry(id, &entry));
   EXPECT_TRUE(entry.file_specific_info().cache_state().is_dirty());
 
   // Cannot clear the dirty bit of an opened entry.
   EXPECT_EQ(FILE_ERROR_IN_USE, cache_->ClearDirty(id));
 
   // Close the file and clear the dirty bit.
   file_closer.reset();
+  base::RunLoop().RunUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, cache_->ClearDirty(id));
 
   // Entry is not dirty.
   EXPECT_EQ(FILE_ERROR_OK, metadata_storage_->GetEntry(id, &entry));
   EXPECT_FALSE(entry.file_specific_info().cache_state().is_dirty());
 }
 
 TEST_F(FileCacheTest, Remove) {
   const base::FilePath src_file_path = temp_dir_.path().Append("test.dat");
   const std::string src_contents = "test";
@@ skipping 73 matching lines @@
 
   // Clear cache.
   EXPECT_TRUE(cache_->ClearAll());
 
   // Verify that the cache is removed.
   EXPECT_TRUE(base::IsDirectoryEmpty(cache_files_dir_));
 }
 
 }  // namespace internal
 }  // namespace drive