Drive API: Simplify lifetime management of child requests in BatchUploadRequest.

google_apis/drive/base_requests_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 "google_apis/drive/base_requests.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "google_apis/drive/drive_api_parser.h"
+#include "google_apis/drive/drive_api_requests.h"
 #include "google_apis/drive/dummy_auth_service.h"
 #include "google_apis/drive/request_sender.h"
 #include "google_apis/drive/test_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace google_apis {
@@ skipping 24 matching lines @@
     callback_.Run(code);
   }
 
   EntryActionCallback callback_;
   GURL url_;
 };
 
 class FakeMultipartUploadRequest : public MultipartUploadRequestBase {
  public:
   FakeMultipartUploadRequest(
-      RequestSender* sender,
+      base::SequencedTaskRunner* blocking_task_runner,
       const std::string& metadata_json,
       const std::string& content_type,
       int64 content_length,
       const base::FilePath& local_file_path,
       const FileResourceCallback& callback,
       const google_apis::ProgressCallback& progress_callback,
       const GURL& url,
       std::string* upload_content_type,
       std::string* upload_content_data)
-      : MultipartUploadRequestBase(sender,
+      : MultipartUploadRequestBase(blocking_task_runner,
                                    metadata_json,
                                    content_type,
                                    content_length,
                                    local_file_path,
                                    callback,
                                    progress_callback),
         url_(url),
         upload_content_type_(upload_content_type),
         upload_content_data_(upload_content_data) {}
 
   ~FakeMultipartUploadRequest() override {}
 
+  net::URLFetcher::RequestType GetRequestType() const override {
+    return net::URLFetcher::POST;
+  }
+
   bool GetContentData(std::string* content_type,
                       std::string* content_data) override {
     const bool result =
         MultipartUploadRequestBase::GetContentData(content_type, content_data);
     *upload_content_type_ = *content_type;
     *upload_content_data_ = *content_data;
     return result;
   }
 
-  base::SequencedTaskRunner* blocking_task_runner() const {
-    return MultipartUploadRequestBase::blocking_task_runner();
-  }
-
  protected:
   GURL GetURL() const override { return url_; }
 
  private:
   const GURL url_;
   std::string* const upload_content_type_;
   std::string* const upload_content_data_;
 };
 
 }  // namespace
@@ skipping 86 matching lines @@
 TEST_F(MultipartUploadRequestBaseTest, Basic) {
   response_code_ = net::HTTP_OK;
   response_body_ = "{\"kind\": \"drive#file\", \"id\": \"file_id\"}";
   scoped_ptr<google_apis::FileResource> file;
   DriveApiErrorCode error = DRIVE_OTHER_ERROR;
   base::RunLoop run_loop;
   const base::FilePath source_path =
       google_apis::test_util::GetTestFilePath("chromeos/file_manager/text.txt");
   std::string upload_content_type;
   std::string upload_content_data;
-  scoped_ptr<FakeMultipartUploadRequest> request(new FakeMultipartUploadRequest(
-      sender_.get(), "{json:\"test\"}", "text/plain", 10, source_path,
-      test_util::CreateQuitCallback(
-          &run_loop, test_util::CreateCopyResultCallback(&error, &file)),
-      ProgressCallback(), test_server_.base_url(), &upload_content_type,
-      &upload_content_data));
-  request->SetBoundaryForTesting("TESTBOUNDARY");
+  FakeMultipartUploadRequest* const multipart_request =
+      new FakeMultipartUploadRequest(
+          sender_->blocking_task_runner(), "{json:\"test\"}", "text/plain", 10,
+          source_path,
+          test_util::CreateQuitCallback(
+              &run_loop, test_util::CreateCopyResultCallback(&error, &file)),
+          ProgressCallback(), test_server_.base_url(), &upload_content_type,
+          &upload_content_data);
+  multipart_request->SetBoundaryForTesting("TESTBOUNDARY");
+  scoped_ptr<drive::SingleBatchableDelegateRequest> request(
+      new drive::SingleBatchableDelegateRequest(
+          sender_.get(), multipart_request));
   sender_->StartRequestWithRetry(request.release());
   run_loop.Run();
   EXPECT_EQ("multipart/related; boundary=TESTBOUNDARY", upload_content_type);
   EXPECT_EQ(
       "--TESTBOUNDARY\n"
       "Content-Type: application/json\n"
       "\n"
       "{json:\"test\"}\n"
       "--TESTBOUNDARY\n"
       "Content-Type: text/plain\n"
       "\n"
       "This is a sample file. I like chocolate and chips.\n"
       "\n"
       "--TESTBOUNDARY--",
       upload_content_data);
   ASSERT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ("file_id", file->file_id());
 }
 
 }  // Namespace google_apis