Eliminate CopyResultFromUploadRangeCallbackAndQuit.

Replace the method with CreateCopyResultCallback, RunAndQuit and
CreateComposedCallback.

BUG=180569
TEST=Ran unit_tests --gtest_filter=GDataWapiOperationsTest*


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

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

1 files changed, 22 insertions, 32 deletions

diff --git a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
index ec76982..43252b1 100644
--- a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 #include "chrome/browser/google_apis/operation_registry.h"
+#include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/google_apis/test_server/http_request.h"
 #include "chrome/browser/google_apis/test_server/http_response.h"
 #include "chrome/browser/google_apis/test_server/http_server.h"
@@ -36,17 +37,6 @@ const char kTestGDataAuthToken[] = "testtoken";
 const char kTestUserAgent[] = "test-user-agent";
 const char kTestETag[] = "test_etag";
 
-// Copies the result from ResumeUploadCallback and quit the message loop.
-void CopyResultFromUploadRangeCallbackAndQuit(
-    UploadRangeResponse* out_response,
-    scoped_ptr<ResourceEntry>* out_new_entry,
-    const UploadRangeResponse& response,
-    scoped_ptr<ResourceEntry> new_entry) {
-  *out_response = response;
-  *out_new_entry = new_entry.Pass();
-  MessageLoop::current()->Quit();
-}
-
 class GDataWapiOperationsTest : public testing::Test {
  public:
   GDataWapiOperationsTest()
@@ -883,9 +873,9 @@ TEST_F(GDataWapiOperationsTest, UploadNewFile) {
   ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
       &operation_registry_,
       request_context_getter_.get(),
-      base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
-                 &response,
-                 &new_entry),
+      CreateComposedCallback(
+          base::Bind(&test_util::RunAndQuit),
+          test_util::CreateCopyResultCallback(&response, &new_entry)),
       UPLOAD_NEW_FILE,
       base::FilePath::FromUTF8Unsafe("drive/newfile.txt"),
       upload_url,
@@ -987,9 +977,9 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) {
         new GetUploadStatusOperation(
             &operation_registry_,
             request_context_getter_.get(),
-            base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
-                       &response,
-                       &new_entry),
+            CreateComposedCallback(
+                base::Bind(&test_util::RunAndQuit),
+                test_util::CreateCopyResultCallback(&response, &new_entry)),
             UPLOAD_NEW_FILE,
             base::FilePath::FromUTF8Unsafe("drive/newfile.txt"),
             upload_url,
@@ -1037,9 +1027,9 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) {
     ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
         &operation_registry_,
         request_context_getter_.get(),
-        base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
-                   &response,
-                   &new_entry),
+        CreateComposedCallback(
+            base::Bind(&test_util::RunAndQuit),
+            test_util::CreateCopyResultCallback(&response, &new_entry)),
         UPLOAD_NEW_FILE,
         base::FilePath::FromUTF8Unsafe("drive/newfile.txt"),
         upload_url,
@@ -1089,9 +1079,9 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) {
         new GetUploadStatusOperation(
             &operation_registry_,
             request_context_getter_.get(),
-            base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
-                       &response,
-                       &new_entry),
+            CreateComposedCallback(
+                base::Bind(&test_util::RunAndQuit),
+                test_util::CreateCopyResultCallback(&response, &new_entry)),
             UPLOAD_NEW_FILE,
             base::FilePath::FromUTF8Unsafe("drive/newfile.txt"),
             upload_url,
@@ -1181,9 +1171,9 @@ TEST_F(GDataWapiOperationsTest, UploadNewEmptyFile) {
   ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
       &operation_registry_,
       request_context_getter_.get(),
-      base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
-                 &response,
-                 &new_entry),
+      CreateComposedCallback(
+          base::Bind(&test_util::RunAndQuit),
+          test_util::CreateCopyResultCallback(&response, &new_entry)),
       UPLOAD_NEW_FILE,
       base::FilePath::FromUTF8Unsafe("drive/newfile.txt"),
       upload_url,
@@ -1272,9 +1262,9 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFile) {
   ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
       &operation_registry_,
       request_context_getter_.get(),
-      base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
-                 &response,
-                 &new_entry),
+      CreateComposedCallback(
+          base::Bind(&test_util::RunAndQuit),
+          test_util::CreateCopyResultCallback(&response, &new_entry)),
       UPLOAD_EXISTING_FILE,
       base::FilePath::FromUTF8Unsafe("drive/existingfile.txt"),
       upload_url,
@@ -1365,9 +1355,9 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFileWithETag) {
   ResumeUploadOperation* resume_operation = new ResumeUploadOperation(
       &operation_registry_,
       request_context_getter_.get(),
-      base::Bind(&CopyResultFromUploadRangeCallbackAndQuit,
-                 &response,
-                 &new_entry),
+      CreateComposedCallback(
+          base::Bind(&test_util::RunAndQuit),
+          test_util::CreateCopyResultCallback(&response, &new_entry)),
       UPLOAD_EXISTING_FILE,
       base::FilePath::FromUTF8Unsafe("drive/existingfile.txt"),
       upload_url,