Eliminate CopyResultsFromGetResourceEntryCallback.

Replace the method with CreateCopyResultCallback and CreateComposedCallback.

BUG=180569
TEST=Ran ./out/Debug/unit_tests


Review URL: https://chromiumcodereview.appspot.com/12447019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188301 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 58 deletions

diff --git a/chrome/browser/google_apis/fake_drive_service_unittest.cc b/chrome/browser/google_apis/fake_drive_service_unittest.cc
index d327d4a..4b99af0 100644
--- a/chrome/browser/google_apis/fake_drive_service_unittest.cc
+++ b/chrome/browser/google_apis/fake_drive_service_unittest.cc
@@ -34,9 +34,7 @@ class FakeDriveServiceTest : public testing::Test {
     scoped_ptr<ResourceEntry> resource_entry;
     fake_service_.GetResourceEntry(
         resource_id,
-        base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                   &error,
-                   &resource_entry));
+        test_util::CreateCopyResultCallback(&error, &resource_entry));
     message_loop_.RunUntilIdle();
     return resource_entry.Pass();
   }
@@ -56,9 +54,7 @@ class FakeDriveServiceTest : public testing::Test {
     fake_service_.AddNewDirectory(
         parent_resource_id,
         directory_name,
-        base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                   &error,
-                   &resource_entry));
+        test_util::CreateCopyResultCallback(&error, &resource_entry));
     message_loop_.RunUntilIdle();
     return error == HTTP_CREATED;
   }
@@ -521,9 +517,7 @@ TEST_F(FakeDriveServiceTest, GetResourceEntry_ExistingFile) {
   scoped_ptr<ResourceEntry> resource_entry;
   fake_service_.GetResourceEntry(
       kResourceId,
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
@@ -541,9 +535,7 @@ TEST_F(FakeDriveServiceTest, GetResourceEntry_NonexistingFile) {
   scoped_ptr<ResourceEntry> resource_entry;
   fake_service_.GetResourceEntry(
       kResourceId,
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_NOT_FOUND, error);
@@ -560,9 +552,7 @@ TEST_F(FakeDriveServiceTest, GetResourceEntry_Offline) {
   scoped_ptr<ResourceEntry> resource_entry;
   fake_service_.GetResourceEntry(
       kResourceId,
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(GDATA_NO_CONNECTION, error);
@@ -709,9 +699,7 @@ TEST_F(FakeDriveServiceTest, CopyHostedDocument_ExistingHostedDocument) {
   fake_service_.CopyHostedDocument(
       kResourceId,
       "new name",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
@@ -734,9 +722,7 @@ TEST_F(FakeDriveServiceTest, CopyHostedDocument_NonexistingHostedDocument) {
   fake_service_.CopyHostedDocument(
       kResourceId,
       "new name",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_NOT_FOUND, error);
@@ -752,9 +738,7 @@ TEST_F(FakeDriveServiceTest, CopyHostedDocument_ExistingRegularFile) {
   fake_service_.CopyHostedDocument(
       kResourceId,
       "new name",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   // The copy should fail as this is not a hosted document.
@@ -773,9 +757,7 @@ TEST_F(FakeDriveServiceTest, CopyHostedDocument_Offline) {
   fake_service_.CopyHostedDocument(
       kResourceId,
       "new name",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(GDATA_NO_CONNECTION, error);
@@ -1074,9 +1056,7 @@ TEST_F(FakeDriveServiceTest, AddNewDirectory_ToRootDirectory) {
   fake_service_.AddNewDirectory(
       fake_service_.GetRootResourceId(),
       "new directory",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_CREATED, error);
@@ -1103,9 +1083,7 @@ TEST_F(FakeDriveServiceTest, AddNewDirectory_ToRootDirectoryOnEmptyFileSystem) {
   fake_service_.AddNewDirectory(
       fake_service_.GetRootResourceId(),
       "new directory",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_CREATED, error);
@@ -1134,9 +1112,7 @@ TEST_F(FakeDriveServiceTest, AddNewDirectory_ToNonRootDirectory) {
   fake_service_.AddNewDirectory(
       kParentResourceId,
       "new directory",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_CREATED, error);
@@ -1160,9 +1136,7 @@ TEST_F(FakeDriveServiceTest, AddNewDirectory_ToNonexistingDirectory) {
   fake_service_.AddNewDirectory(
       kParentResourceId,
       "new directory",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(HTTP_NOT_FOUND, error);
@@ -1179,9 +1153,7 @@ TEST_F(FakeDriveServiceTest, AddNewDirectory_Offline) {
   fake_service_.AddNewDirectory(
       fake_service_.GetRootResourceId(),
       "new directory",
-      base::Bind(&test_util::CopyResultsFromGetResourceEntryCallback,
-                 &error,
-                 &resource_entry));
+      test_util::CreateCopyResultCallback(&error, &resource_entry));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(GDATA_NO_CONNECTION, error);
diff --git a/chrome/browser/google_apis/test_util.cc b/chrome/browser/google_apis/test_util.cc
index 31be9a6..5c53c0f 100644
--- a/chrome/browser/google_apis/test_util.cc
+++ b/chrome/browser/google_apis/test_util.cc
@@ -124,15 +124,6 @@ void CopyResultsFromGetDataCallbackAndQuit(GDataErrorCode* error_out,
   MessageLoop::current()->Quit();
 }
 
-void CopyResultsFromGetResourceEntryCallback(
-    GDataErrorCode* error_out,
-    scoped_ptr<ResourceEntry>* resource_entry_out,
-    GDataErrorCode error_in,
-    scoped_ptr<ResourceEntry> resource_entry_in) {
-  resource_entry_out->swap(resource_entry_in);
-  *error_out = error_in;
-}
-
 void CopyResultsFromGetResourceListCallback(
     GDataErrorCode* error_out,
     scoped_ptr<ResourceList>* resource_list_out,
diff --git a/chrome/browser/google_apis/test_util.h b/chrome/browser/google_apis/test_util.h
index d6bddd5a..88b8900 100644
--- a/chrome/browser/google_apis/test_util.h
+++ b/chrome/browser/google_apis/test_util.h
@@ -83,13 +83,6 @@ void CopyResultsFromGetDataCallbackAndQuit(GDataErrorCode* error_out,
                                            GDataErrorCode error_in,
                                            scoped_ptr<base::Value> value_in);
 
-// Copies the results from GetResourceEntryCallback.
-void CopyResultsFromGetResourceEntryCallback(
-    GDataErrorCode* error_out,
-    scoped_ptr<ResourceEntry>* resource_entry_out,
-    GDataErrorCode error_in,
-    scoped_ptr<ResourceEntry> resource_entry_in);
-
 // Copies the results from GetResourceListCallback.
 void CopyResultsFromGetResourceListCallback(
     GDataErrorCode* error_out,