Eliminate CopyResultsFromDownloadActionCallback(AndQuit).

chrome/browser/chromeos/drive/drive_scheduler_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_scheduler.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/prefs/pref_service.h"
@@ skipping 387 matching lines @@
   const GURL kContentUrl("https://file_content_url/");
   const base::FilePath kOutputFilePath =
       temp_dir.path().AppendASCII("whatever.txt");
   google_apis::GDataErrorCode download_error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("/drive/whatever.txt"),  // virtual path
       kOutputFilePath,
       kContentUrl,
       DriveClientContext(BACKGROUND),
-      base::Bind(&google_apis::test_util::CopyResultsFromDownloadActionCallback,
-                 &download_error,
-                 &output_file_path),
+      google_apis::test_util::CreateCopyResultCallback(
+          &download_error, &output_file_path),
       google_apis::GetContentCallback());
   // Metadata should still work
   google_apis::GDataErrorCode metadata_error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::AccountMetadata> account_metadata;
 
   // Try to get the metadata
   scheduler_->GetAccountMetadata(
       google_apis::test_util::CreateCopyResultCallback(
           &metadata_error, &account_metadata));
   google_apis::test_util::RunBlockingPoolTask();
@@ skipping 32 matching lines @@
   const GURL kContentUrl("https://file_content_url/");
   const base::FilePath kOutputFilePath =
       temp_dir.path().AppendASCII("whatever.txt");
   google_apis::GDataErrorCode download_error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("/drive/whatever.txt"),  // virtual path
       kOutputFilePath,
       kContentUrl,
       DriveClientContext(BACKGROUND),
-      base::Bind(&google_apis::test_util::CopyResultsFromDownloadActionCallback,
-                 &download_error,
-                 &output_file_path),
+      google_apis::test_util::CreateCopyResultCallback(
+          &download_error, &output_file_path),
       google_apis::GetContentCallback());
   // Metadata should still work
   google_apis::GDataErrorCode metadata_error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::AccountMetadata> account_metadata;
 
   // Try to get the metadata
   scheduler_->GetAccountMetadata(
       google_apis::test_util::CreateCopyResultCallback(
           &metadata_error, &account_metadata));
   google_apis::test_util::RunBlockingPoolTask();
@@ skipping 32 matching lines @@
   const GURL kContentUrl("https://file_content_url/");
   const base::FilePath kOutputFilePath =
       temp_dir.path().AppendASCII("whatever.txt");
   google_apis::GDataErrorCode download_error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("/drive/whatever.txt"),  // virtual path
       kOutputFilePath,
       kContentUrl,
       DriveClientContext(BACKGROUND),
-      base::Bind(&google_apis::test_util::CopyResultsFromDownloadActionCallback,
-                 &download_error,
-                 &output_file_path),
+      google_apis::test_util::CreateCopyResultCallback(
+          &download_error, &output_file_path),
       google_apis::GetContentCallback());
   // Metadata should still work
   google_apis::GDataErrorCode metadata_error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::AccountMetadata> account_metadata;
 
   // Try to get the metadata
   scheduler_->GetAccountMetadata(
       google_apis::test_util::CreateCopyResultCallback(
           &metadata_error, &account_metadata));
   google_apis::test_util::RunBlockingPoolTask();
@@ skipping 24 matching lines @@
   const GURL kContentUrl("https://file_content_url/");
   const base::FilePath kOutputFilePath =
       temp_dir.path().AppendASCII("whatever.txt");
   google_apis::GDataErrorCode download_error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("/drive/whatever.txt"),  // virtual path
       kOutputFilePath,
       kContentUrl,
       DriveClientContext(BACKGROUND),
-      base::Bind(&google_apis::test_util::CopyResultsFromDownloadActionCallback,
-                 &download_error,
-                 &output_file_path),
+      google_apis::test_util::CreateCopyResultCallback(
+          &download_error, &output_file_path),
       google_apis::GetContentCallback());
   // Metadata should still work
   google_apis::GDataErrorCode metadata_error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::AccountMetadata> account_metadata;
 
   // Try to get the metadata
   scheduler_->GetAccountMetadata(
       google_apis::test_util::CreateCopyResultCallback(
           &metadata_error, &account_metadata));
   google_apis::test_util::RunBlockingPoolTask();
 
   // Check the metadata
   ASSERT_EQ(google_apis::HTTP_SUCCESS, metadata_error);
   ASSERT_TRUE(account_metadata);
 
   // Check the download
   EXPECT_EQ(google_apis::HTTP_SUCCESS, download_error);
   std::string content;
   EXPECT_EQ(output_file_path, kOutputFilePath);
   ASSERT_TRUE(file_util::ReadFileToString(output_file_path, &content));
   // The content is "x"s of the file size specified in root_feed.json.
   EXPECT_EQ("xxxxxxxxxx", content);
 }
 
 }  // namespace drive