Implement generic CreateCopyResultCallback and RunAndQuit.

chrome/browser/google_apis/drive_api_operations_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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/drive_api_operations.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/drive_api_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"
 #include "chrome/browser/google_apis/test_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace google_apis {
 
 namespace {
 
 const char kTestDriveApiAuthToken[] = "testtoken";
 const char kTestETag[] = "test_etag";
 const char kTestUserAgent[] = "test-user-agent";
 
 const char kTestChildrenResponse[] =
     "{\n"
     "\"kind\": \"drive#childReference\",\n"
     "\"id\": \"resource_id\",\n"
     "\"selfLink\": \"self_link\",\n"
     "\"childLink\": \"child_link\",\n"
     "}\n";
 
 const char kTestUploadExistingFilePath[] = "/upload/existingfile/path";
 const char kTestUploadNewFilePath[] = "/upload/newfile/path";
 
-void CopyResultsFromGetAboutResourceCallbackAndQuit(
-    GDataErrorCode* error_out,
-    scoped_ptr<AboutResource>* about_resource_out,
-    const GDataErrorCode error_in,
-    scoped_ptr<AboutResource> about_resource_in) {
-  *error_out = error_in;
-  *about_resource_out = about_resource_in.Pass();
-  MessageLoop::current()->Quit();
-}
-
 void CopyResultsFromFileResourceCallbackAndQuit(
     GDataErrorCode* error_out,
     scoped_ptr<FileResource>* file_resource_out,
     const GDataErrorCode error_in,
     scoped_ptr<FileResource> file_resource_in) {
   *error_out = error_in;
   *file_resource_out = file_resource_in.Pass();
   MessageLoop::current()->Quit();
 }
 
@@ skipping 271 matching lines @@
   expected_data_file_path_ = test_util::GetTestFilePath(
       "chromeos/drive/about.json");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<AboutResource> feed_data;
 
   GetAboutOperation* operation = new GetAboutOperation(
       &operation_registry_,
       request_context_getter_.get(),
       *url_generator_,
-      base::Bind(&CopyResultsFromGetAboutResourceCallbackAndQuit,
-                 &error, &feed_data));
+      CreateComposedCallback(
+          base::Bind(&test_util::RunAndQuit),
+          test_util::CreateCopyResultCallback(&error, &feed_data)));
   operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
                    base::Bind(&test_util::DoNothingForReAuthenticateCallback));
   MessageLoop::current()->Run();
 
   EXPECT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/about", http_request_.relative_url);
 
   scoped_ptr<AboutResource> expected(
       AboutResource::CreateFrom(
@@ skipping 10 matching lines @@
   expected_data_file_path_ = test_util::GetTestFilePath(
       "chromeos/gdata/testfile.txt");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<AboutResource> feed_data;
 
   GetAboutOperation* operation = new GetAboutOperation(
       &operation_registry_,
       request_context_getter_.get(),
       *url_generator_,
-      base::Bind(&CopyResultsFromGetAboutResourceCallbackAndQuit,
-                 &error, &feed_data));
+      CreateComposedCallback(
+          base::Bind(&test_util::RunAndQuit),
+          test_util::CreateCopyResultCallback(&error, &feed_data)));
   operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
                    base::Bind(&test_util::DoNothingForReAuthenticateCallback));
   MessageLoop::current()->Run();
 
   // "parse error" should be returned, and the feed should be NULL.
   EXPECT_EQ(GDATA_PARSE_ERROR, error);
   EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/drive/v2/about", http_request_.relative_url);
   EXPECT_FALSE(feed_data.get());
 }
@@ skipping 685 matching lines @@
   EXPECT_EQ("Conflicting-etag", http_request_.headers["If-Match"]);
 
   EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
   EXPECT_EQ("/upload/drive/v2/files/resource_id?uploadType=resumable",
             http_request_.relative_url);
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_TRUE(http_request_.content.empty());
 }
 
 }  // namespace google_apis