Eliminate small CopyResultFromXxxCallback families in drive_test_util.

chrome/browser/chromeos/drive/drive_file_system_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/drive_file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 2063 matching lines @@
 
   file_system_->Search("\"no-match query\"", false, GURL(), callback);
   message_loop_.Run();  // Wait to get our result.
 }
 
 TEST_F(DriveFileSystemTest, GetAvailableSpace) {
   DriveFileError error = DRIVE_FILE_OK;
   int64 bytes_total;
   int64 bytes_used;
   file_system_->GetAvailableSpace(
-      base::Bind(&test_util::CopyResultsFromGetAvailableSpaceCallback,
-                 &error, &bytes_total, &bytes_used));
+      google_apis::test_util::CreateCopyResultCallback(
+          &error, &bytes_total, &bytes_used));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(GG_LONGLONG(6789012345), bytes_used);
   EXPECT_EQ(GG_LONGLONG(9876543210), bytes_total);
 }
 
 TEST_F(DriveFileSystemTest, RefreshDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
 
   // We'll notify the directory change to the observer.
   EXPECT_CALL(*mock_directory_observer_,
@@ skipping 28 matching lines @@
 
   // Pretend we have enough space.
   fake_free_disk_space_getter_->set_fake_free_disk_space(
       file_size + kMinFreeSpace);
 
   // Open kFileInRoot ("drive/File 1.txt").
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   base::FilePath file_path;
   file_system_->OpenFile(
       kFileInRoot,
-      base::Bind(&test_util::CopyResultsFromOpenFileCallbackAndQuit,
-                 &error, &file_path));
-  message_loop_.Run();
+      google_apis::test_util::CreateCopyResultCallback(&error, &file_path));
+  google_apis::test_util::RunBlockingPoolTask();
   const base::FilePath opened_file_path = file_path;
 
   // Verify that the file was properly opened.
   EXPECT_EQ(DRIVE_FILE_OK, error);
 
   // Try to open the already opened file.
   file_system_->OpenFile(
       kFileInRoot,
-      base::Bind(&test_util::CopyResultsFromOpenFileCallbackAndQuit,
-                 &error, &file_path));
-  message_loop_.Run();
+      google_apis::test_util::CreateCopyResultCallback(&error, &file_path));
+  google_apis::test_util::RunBlockingPoolTask();
 
   // It must fail.
   EXPECT_EQ(DRIVE_FILE_ERROR_IN_USE, error);
 
   // Verify that the file contents match the expected contents.
   // The content is "x"s of the file size.
   const std::string kExpectedContent = "xxxxxxxxxx";
   std::string cache_file_data;
   EXPECT_TRUE(file_util::ReadFileToString(opened_file_path, &cache_file_data));
   EXPECT_EQ(kExpectedContent, cache_file_data);
 
   DriveCacheEntry cache_entry;
   EXPECT_TRUE(GetCacheEntryFromOriginThread(file_resource_id, file_md5,
                                             &cache_entry));
   EXPECT_TRUE(cache_entry.is_present());
   EXPECT_TRUE(cache_entry.is_dirty());
   EXPECT_TRUE(cache_entry.is_persistent());
 
   base::FilePath cache_file_path;
   cache_->GetFile(file_resource_id, file_md5,
                   google_apis::test_util::CreateCopyResultCallback(
                       &error, &cache_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   EXPECT_EQ(cache_file_path, opened_file_path);
 
   // Close kFileInRoot ("drive/File 1.txt").
   file_system_->CloseFile(
       kFileInRoot,
-      base::Bind(&test_util::CopyResultsFromCloseFileCallbackAndQuit,
-                 &error));
-  message_loop_.Run();
+      google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
 
   // Verify that the file was properly closed.
   EXPECT_EQ(DRIVE_FILE_OK, error);
 
   // Verify that the cache state was changed as expected.
   EXPECT_TRUE(GetCacheEntryFromOriginThread(file_resource_id, file_md5,
                                             &cache_entry));
   EXPECT_TRUE(cache_entry.is_present());
   EXPECT_TRUE(cache_entry.is_dirty());
   EXPECT_TRUE(cache_entry.is_persistent());
 
   // Try to close the same file twice.
   file_system_->CloseFile(
       kFileInRoot,
-      base::Bind(&test_util::CopyResultsFromCloseFileCallbackAndQuit,
-                 &error));
-  message_loop_.Run();
+      google_apis::test_util::CreateCopyResultCallback(&error));
+  google_apis::test_util::RunBlockingPoolTask();
 
   // It must fail.
   EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, error);
 }
 
 // TODO(satorux): Testing if WebAppsRegistry is loaded here is awkward. We
 // should move this to change_list_loader_unittest.cc. crbug.com/161703
 TEST_F(DriveFileSystemTest, WebAppsRegistryIsLoaded) {
   ASSERT_TRUE(SaveTestFileSystem(USE_SERVER_TIMESTAMP));
 
@@ skipping 12 matching lines @@
 
   // An app for foo.exe should now be found, as the registry was loaded.
   drive_webapps_registry_->GetWebAppsForFile(
       base::FilePath(FILE_PATH_LITERAL("foo.exe")),
       "" /* mime_type */,
       &apps);
   EXPECT_EQ(1U, apps.size());
 }
 
 }   // namespace drive