Split InitiateUpload method into two.

chrome/browser/google_apis/drive_uploader_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 "chrome/browser/google_apis/drive_uploader.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <string>
 
@@ skipping 49 matching lines @@
        received_bytes_(0),
        resume_upload_call_count_(0) {}
 
   int64 received_bytes() const { return received_bytes_; }
 
   int64 resume_upload_call_count() const { return resume_upload_call_count_; }
 
  private:
   // DriveServiceInterface overrides.
   // Handles a request for obtaining an upload location URL.
-  virtual void InitiateUpload(const InitiateUploadParams& params,
-                              const InitiateUploadCallback& callback) OVERRIDE {
+  virtual void InitiateUploadNewFile(
+      const FilePath& drive_file_path,
+      const std::string& content_type,
+      int64 content_length,
+      const GURL& parent_upload_url,
+      const std::string& title,
+      const InitiateUploadCallback& callback) OVERRIDE {
+    EXPECT_EQ(kTestDocumentTitle, title);
+    EXPECT_EQ(kTestMimeType, content_type);
     const int64 expected_size = expected_upload_content_.size();
+    EXPECT_EQ(expected_size, content_length);
+    EXPECT_EQ(GURL(kTestInitialUploadURL), parent_upload_url);
 
-    // Verify that the expected parameters are passed.
-    if (params.upload_mode == UPLOAD_NEW_FILE)
-      EXPECT_EQ(kTestDocumentTitle, params.title);
-    else
-      EXPECT_EQ("", params.title);
-    EXPECT_EQ(kTestMimeType, params.content_type);
-    EXPECT_EQ(expected_size, params.content_length);
-    EXPECT_EQ(GURL(kTestInitialUploadURL), params.upload_location);
+    // Calls back the upload URL for subsequent ResumeUpload operations.
+    // InitiateUpload is an asynchronous function, so don't callback directly.
+    MessageLoop::current()->PostTask(FROM_HERE,
+        base::Bind(callback, HTTP_SUCCESS, GURL(kTestUploadURL)));
+  }
 
-    if (!params.etag.empty() && params.etag != kTestETag) {
+  virtual void InitiateUploadExistingFile(
+      const FilePath& drive_file_path,
+      const std::string& content_type,
+      int64 content_length,
+      const GURL& upload_url,
+      const std::string& etag,
+      const InitiateUploadCallback& callback) OVERRIDE {
+    EXPECT_EQ(kTestMimeType, content_type);
+    const int64 expected_size = expected_upload_content_.size();
+    EXPECT_EQ(expected_size, content_length);
+    EXPECT_EQ(GURL(kTestInitialUploadURL), upload_url);
+
+    if (!etag.empty() && etag != kTestETag) {
       MessageLoop::current()->PostTask(FROM_HERE,
           base::Bind(callback, HTTP_PRECONDITION, GURL()));
       return;
     }
 
     // Calls back the upload URL for subsequent ResumeUpload operations.
     // InitiateUpload is an asynchronous function, so don't callback directly.
     MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(callback, HTTP_SUCCESS, GURL(kTestUploadURL)));
   }
@@ skipping 51 matching lines @@
   }
 
   std::string expected_upload_content_;
   int64 received_bytes_;
   int64 resume_upload_call_count_;
 };
 
 // Mock DriveService that returns a failure at InitiateUpload().
 class MockDriveServiceNoConnectionAtInitiate : public DummyDriveService {
   // Returns error.
-  virtual void InitiateUpload(const InitiateUploadParams& params,
-                              const InitiateUploadCallback& callback) OVERRIDE {
+  virtual void InitiateUploadNewFile(
+      const FilePath& drive_file_path,
+      const std::string& content_type,
+      int64 content_length,
+      const GURL& parent_upload_url,
+      const std::string& title,
+      const InitiateUploadCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
   }
+
+  virtual void InitiateUploadExistingFile(
+      const FilePath& drive_file_path,
+      const std::string& content_type,
+      int64 content_length,
+      const GURL& upload_url,
+      const std::string& etag,
+      const InitiateUploadCallback& callback) OVERRIDE {
+    MessageLoop::current()->PostTask(FROM_HERE,
+        base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
+  }
 
   // Should not be used.
   virtual void ResumeUpload(const ResumeUploadParams& params,
                             const UploadRangeCallback& callback) OVERRIDE {
     NOTREACHED();
   }
 };
 
 // Mock DriveService that returns a failure at ResumeUpload().
 class MockDriveServiceNoConnectionAtResume : public DummyDriveService {
   // Succeeds and returns an upload location URL.
-  virtual void InitiateUpload(const InitiateUploadParams& params,
-                              const InitiateUploadCallback& callback) OVERRIDE {
+  virtual void InitiateUploadNewFile(
+      const FilePath& drive_file_path,
+      const std::string& content_type,
+      int64 content_length,
+      const GURL& parent_upload_url,
+      const std::string& title,
+      const InitiateUploadCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(callback, HTTP_SUCCESS, GURL(kTestInitialUploadURL)));
   }
+
+  virtual void InitiateUploadExistingFile(
+      const FilePath& drive_file_path,
+      const std::string& content_type,
+      int64 content_length,
+      const GURL& upload_url,
+      const std::string& etag,
+      const InitiateUploadCallback& callback) OVERRIDE {
+    MessageLoop::current()->PostTask(FROM_HERE,
+        base::Bind(callback, HTTP_SUCCESS, GURL(kTestInitialUploadURL)));
+  }
 
   // Returns error.
   virtual void ResumeUpload(const ResumeUploadParams& params,
                             const UploadRangeCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(callback,
                    UploadRangeResponse(GDATA_NO_CONNECTION, -1, -1),
                    base::Passed(scoped_ptr<ResourceEntry>())));
   }
 };
@@ skipping 255 matching lines @@
       kTestMimeType,
       "",  // etag
       base::Bind(&CopyResultsFromUploadCompletionCallbackAndQuit, &out));
   message_loop_.Run();
 
   // Should return failure without doing any attempt to connect to the server.
   EXPECT_EQ(DRIVE_UPLOAD_ERROR_NOT_FOUND, out.error);
 }
 
 }  // namespace google_apis