Eliminate CopyResultsFromXxxCallback defined in drive_resource_metadata_unittest.cc

chrome/browser/chromeos/drive/drive_resource_metadata_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_resource_metadata.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 18 matching lines @@
 // See drive.proto for the difference between the two URLs.
 const char kResumableEditMediaUrl[] = "http://resumable-edit-media/";
 const char kResumableCreateMediaUrl[] = "http://resumable-create-media/";
 
 const char kTestRootResourceId[] = "test_root";
 
 // The changestamp of the resource metadata used in
 // DriveResourceMetadataTest.
 const int64 kTestChangestamp = 100;
 
-// Copies result from GetChildDirectoriesCallback.
-void CopyResultFromGetChildDirectoriesCallback(
-    std::set<base::FilePath>* out_child_directories,
-    const std::set<base::FilePath>& in_child_directories) {
-  *out_child_directories = in_child_directories;
-}
-
-// Copies result from GetChangestampCallback.
-void CopyResultFromGetChangestampCallback(
-    int64* out_changestamp, int64 in_changestamp) {
-  *out_changestamp = in_changestamp;
-}
-
 // Returns the sorted base names from |entries|.
 std::vector<std::string> GetSortedBaseNames(
     const DriveEntryProtoVector& entries) {
   std::vector<std::string> base_names;
   for (size_t i = 0; i < entries.size(); ++i)
     base_names.push_back(entries[i].base_name());
   std::sort(base_names.begin(), base_names.end());
 
   return base_names;
 }
@@ skipping 265 matching lines @@
 
   int64 in_changestamp = 123456;
   resource_metadata->SetLargestChangestamp(
       in_changestamp,
       google_apis::test_util::CreateCopyResultCallback(&error));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
 
   int64 out_changestamp = 0;
   resource_metadata->GetLargestChangestamp(
-      base::Bind(&CopyResultFromGetChangestampCallback,
-                 &out_changestamp));
+      google_apis::test_util::CreateCopyResultCallback(&out_changestamp));
   google_apis::test_util::RunBlockingPoolTask();
   DCHECK_EQ(in_changestamp, out_changestamp);
 }
 
 TEST_F(DriveResourceMetadataTest, GetEntryInfoByResourceId_RootDirectory) {
   scoped_ptr<DriveResourceMetadata, test_util::DestroyHelperForTests>
       resource_metadata(new DriveResourceMetadata(kTestRootResourceId,
                                                   temp_dir_.path(),
                                                   blocking_task_runner_));
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
@@ skipping 791 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(
           &error, &drive_file_path));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_ERROR_EXISTS, error);
 }
 
 TEST_F(DriveResourceMetadataTest, GetChildDirectories) {
   std::set<base::FilePath> child_directories;
 
   // file9: not a directory, so no children.
-  resource_metadata_->GetChildDirectories("resource_id:file9",
-      base::Bind(&CopyResultFromGetChildDirectoriesCallback,
-                 &child_directories));
+  resource_metadata_->GetChildDirectories(
+      "resource_id:file9",
+      google_apis::test_util::CreateCopyResultCallback(&child_directories));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_TRUE(child_directories.empty());
 
   // dir2: no child directories.
-  resource_metadata_->GetChildDirectories("resource_id:dir2",
-      base::Bind(&CopyResultFromGetChildDirectoriesCallback,
-                 &child_directories));
+  resource_metadata_->GetChildDirectories(
+      "resource_id:dir2",
+      google_apis::test_util::CreateCopyResultCallback(&child_directories));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_TRUE(child_directories.empty());
 
   // dir1: dir3 is the only child
-  resource_metadata_->GetChildDirectories("resource_id:dir1",
-      base::Bind(&CopyResultFromGetChildDirectoriesCallback,
-                 &child_directories));
+  resource_metadata_->GetChildDirectories(
+      "resource_id:dir1",
+      google_apis::test_util::CreateCopyResultCallback(&child_directories));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(1u, child_directories.size());
   EXPECT_EQ(1u, child_directories.count(
       base::FilePath::FromUTF8Unsafe("drive/dir1/dir3")));
 
   // Add a few more directories to make sure deeper nesting works.
   // dir2/dir100
   // dir2/dir101
   // dir2/dir101/dir102
   // dir2/dir101/dir103
@@ skipping 12 matching lines @@
       resource_metadata_.get(), sequence_id++, true, "resource_id:dir101"));
   ASSERT_TRUE(AddDriveEntryProto(
       resource_metadata_.get(), sequence_id++, true, "resource_id:dir101"));
   ASSERT_TRUE(AddDriveEntryProto(
       resource_metadata_.get(), sequence_id++, true, "resource_id:dir102"));
   ASSERT_TRUE(AddDriveEntryProto(
       resource_metadata_.get(), sequence_id++, true, "resource_id:dir105"));
   ASSERT_TRUE(AddDriveEntryProto(
       resource_metadata_.get(), sequence_id++, true, "resource_id:dir106"));
 
-  resource_metadata_->GetChildDirectories("resource_id:dir2",
-      base::Bind(&CopyResultFromGetChildDirectoriesCallback,
-                 &child_directories));
+  resource_metadata_->GetChildDirectories(
+      "resource_id:dir2",
+      google_apis::test_util::CreateCopyResultCallback(&child_directories));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(8u, child_directories.size());
   EXPECT_EQ(1u, child_directories.count(base::FilePath::FromUTF8Unsafe(
       "drive/dir2/dir101")));
   EXPECT_EQ(1u, child_directories.count(base::FilePath::FromUTF8Unsafe(
       "drive/dir2/dir101/dir104")));
   EXPECT_EQ(1u, child_directories.count(base::FilePath::FromUTF8Unsafe(
       "drive/dir2/dir101/dir102/dir105/dir106/dir107")));
 }
 
@@ skipping 119 matching lines @@
   // Try to get some data.
   scoped_ptr<DriveEntryProto> entry = GetEntryInfoByPathSync(
       base::FilePath::FromUTF8Unsafe("drive/dir1/dir3/file9"));
   ASSERT_TRUE(entry.get());
   EXPECT_EQ("file9", entry->base_name());
   ASSERT_TRUE(!entry->file_info().is_directory());
   EXPECT_EQ("md5:file9", entry->file_specific_info().file_md5());
 }
 
 }  // namespace drive