Eliminate CopyResultsFromGetResourceEntryCallback.

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 212 matching lines @@
 
 TEST_F(DriveSchedulerTest, GetResourceEntry) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::ResourceEntry> entry;
 
   scheduler_->GetResourceEntry(
       "file:2_file_resource_id",  // resource ID
       DriveClientContext(USER_INITIATED),
-      base::Bind(
-          &google_apis::test_util::CopyResultsFromGetResourceEntryCallback,
-          &error,
-          &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
   ASSERT_TRUE(entry);
 }
 
 TEST_F(DriveSchedulerTest, DeleteResource) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
 
   scheduler_->DeleteResource(
       "file:2_file_resource_id",
       google_apis::test_util::CreateCopyResultCallback(&error));
   google_apis::test_util::RunBlockingPoolTask();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
 }
 
 TEST_F(DriveSchedulerTest, CopyHostedDocument) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::ResourceEntry> entry;
 
   scheduler_->CopyHostedDocument(
       "document:5_document_resource_id",  // resource ID
       "New Document",  // new name
-      base::Bind(
-          &google_apis::test_util::CopyResultsFromGetResourceEntryCallback,
-          &error,
-          &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
   ASSERT_TRUE(entry);
 }
 
 TEST_F(DriveSchedulerTest, RenameResource) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
@@ skipping 37 matching lines @@
 
 TEST_F(DriveSchedulerTest, AddNewDirectory) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::ResourceEntry> entry;
 
   scheduler_->AddNewDirectory(
       fake_drive_service_->GetRootResourceId(),  // Root directory.
       "New Directory",
-      base::Bind(
-          &google_apis::test_util::CopyResultsFromGetResourceEntryCallback,
-          &error,
-          &entry));
+      google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   google_apis::test_util::RunBlockingPoolTask();
 
   ASSERT_EQ(google_apis::HTTP_CREATED, error);
   ASSERT_TRUE(entry);
 }
 
 TEST_F(DriveSchedulerTest, GetResourceEntryPriority) {
   // Disconnect from the network to prevent jobs from starting.
   ConnectToNone();
 
@@ skipping 274 matching lines @@
   // 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