Eliminate small CopyResultFromXxxCallback families in drive_test_util.

chrome/browser/chromeos/drive/search_metadata_unittest.cc

 // Copyright (c) 2013 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/search_metadata.h"
 
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
@@ skipping 89 matching lines @@
   scoped_ptr<DriveFileSystem> file_system_;
 };
 
 TEST_F(SearchMetadataTest, SearchMetadata_ZeroMatches) {
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(file_system_.get(),
                  "NonExistent",
                  kDefaultAtMostNumMatches,
-                 base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
-                            &error,
-                            &result));
-
+                 google_apis::test_util::CreateCopyResultCallback(
+                     &error, &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   ASSERT_EQ(0U, result->size());
 }
 
 TEST_F(SearchMetadataTest, SearchMetadata_RegularFile) {
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(file_system_.get(),
                  "SubDirectory File 1.txt",
                  kDefaultAtMostNumMatches,
-                 base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
-                            &error,
-                            &result));
-
+                 google_apis::test_util::CreateCopyResultCallback(
+                     &error, &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   ASSERT_EQ(1U, result->size());
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe(
       "drive/Directory 1/SubDirectory File 1.txt"), result->at(0).path);
 }
 
 // This test checks if |FindAndHighlight| does case-insensitive search.
 // Tricker test cases for |FindAndHighlight| can be found below.
 TEST_F(SearchMetadataTest, SearchMetadata_CaseInsensitiveSearch) {
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   // The query is all in lower case.
   SearchMetadata(file_system_.get(),
                  "subdirectory file 1.txt",
                  kDefaultAtMostNumMatches,
-                 base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
-                            &error,
-                            &result));
-
+                 google_apis::test_util::CreateCopyResultCallback(
+                     &error, &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   ASSERT_EQ(1U, result->size());
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe(
       "drive/Directory 1/SubDirectory File 1.txt"), result->at(0).path);
 }
 
 TEST_F(SearchMetadataTest, SearchMetadata_RegularFiles) {
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(file_system_.get(),
                  "SubDir",
                  kDefaultAtMostNumMatches,
-                 base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
-                            &error,
-                            &result));
-
+                 google_apis::test_util::CreateCopyResultCallback(
+                     &error, &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   ASSERT_EQ(2U, result->size());
 
   // The results should be sorted by the last accessed time.
   EXPECT_EQ(12970368000000000LL,
             result->at(0).entry_proto.file_info().last_accessed());
   EXPECT_EQ(12969849600000000LL,
             result->at(1).entry_proto.file_info().last_accessed());
 
   // All base names should contain "File".
   EXPECT_EQ(
       base::FilePath::FromUTF8Unsafe(
           "drive/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt"),
       result->at(0).path);
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe(
       "drive/Directory 1/SubDirectory File 1.txt"), result->at(1).path);
 }
 
 TEST_F(SearchMetadataTest, SearchMetadata_AtMostOneFile) {
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   // There are two files matching "SubDir" but only one file should be
   // returned.
   SearchMetadata(file_system_.get(),
                  "SubDir",
                  1,  // at_most_num_matches
-                 base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
-                            &error,
-                            &result));
-
+                 google_apis::test_util::CreateCopyResultCallback(
+                     &error, &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   ASSERT_EQ(1U, result->size());
   EXPECT_EQ(
       base::FilePath::FromUTF8Unsafe(
           "drive/Slash \xE2\x88\x95 in directory/Slash SubDir File.txt"),
       result->at(0).path);
 }
 
 TEST_F(SearchMetadataTest, SearchMetadata_Directory) {
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(file_system_.get(),
                  "Directory 1",
                  kDefaultAtMostNumMatches,
-                 base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
-                            &error,
-                            &result));
-
+                 google_apis::test_util::CreateCopyResultCallback(
+                     &error, &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   ASSERT_EQ(1U, result->size());
   EXPECT_EQ(
       base::FilePath::FromUTF8Unsafe("drive/Directory 1"),
       result->at(0).path);
 }
 
 TEST_F(SearchMetadataTest, SearchMetadata_HostedDocument) {
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(file_system_.get(),
                  "Document",
                  kDefaultAtMostNumMatches,
-                 base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
-                            &error,
-                            &result));
-
+                 google_apis::test_util::CreateCopyResultCallback(
+                     &error, &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   ASSERT_EQ(1U, result->size());
 
   EXPECT_EQ(base::FilePath::FromUTF8Unsafe("drive/Document 1.gdoc"),
             result->at(0).path);
 }
 
 TEST_F(SearchMetadataTest, SearchMetadata_HideHostedDocument) {
   // This test is similar to HostedDocument test above, but change a
   // preference to hide hosted documents from the result.
   PrefService* pref_service = profile_->GetPrefs();
   pref_service->SetBoolean(prefs::kDisableDriveHostedFiles, true);
 
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(file_system_.get(),
                  "Document",
                  kDefaultAtMostNumMatches,
-                 base::Bind(&test_util::CopyResultsFromSearchMetadataCallback,
-                            &error,
-                            &result));
-
+                 google_apis::test_util::CreateCopyResultCallback(
+                     &error, &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(DRIVE_FILE_OK, error);
   ASSERT_EQ(0U, result->size());
 }
 
 TEST(SearchMetadataSimpleTest, FindAndHighlight_ZeroMatches) {
   std::string highlighted_text;
   EXPECT_FALSE(FindAndHighlight("text", "query", &highlighted_text));
 }
 
@@ skipping 54 matching lines @@
   EXPECT_EQ("&lt;<b>hello</b>&gt;", highlighted_text);
 }
 
 TEST(SearchMetadataSimpleTest, FindAndHighlight_MoreMetaChars) {
   std::string highlighted_text;
   EXPECT_TRUE(FindAndHighlight("a&b&c&d", "b&c", &highlighted_text));
   EXPECT_EQ("a&amp;<b>b&amp;c</b>&amp;d", highlighted_text);
 }
 
 }   // namespace drive