Split InitiateUpload method into two.

chrome/browser/google_apis/base_operations.h

 // 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.
 //
 // This file provides base classes used to implement operations for Google APIs.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_BASE_OPERATIONS_H_
 #define CHROME_BROWSER_GOOGLE_APIS_BASE_OPERATIONS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/google_apis/drive_upload_mode.h"

[hashimoto, 2013/02/08 11:34:02]

nit: no need to include this anymore.

[hidehiko, 2013/02/08 12:01:50]

Done.

 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/operation_registry.h"
 #include "google_apis/gaia/oauth2_access_token_consumer.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 class OAuth2AccessTokenFetcher;
 
 namespace base {
@@ skipping 229 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<GetDataOperation> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(GetDataOperation);
 };
 
 
 //=========================== InitiateUploadOperation ==========================
 
-// Struct for passing params needed for DriveServiceInterface::InitiateUpload()
-// calls.
-//
-// When uploading a new file (UPLOAD_NEW_FILE):
-// - |title| should be set.
-// - |upload_location| should be the upload_url() of the parent directory.
-//   (resumable-create-media URL)
-// - |etag| is ignored.
-//
-// When updating an existing file (UPLOAD_EXISTING_FILE):
-// - |title| should be empty
-// - |upload_location| should be the upload_url() of the existing file.
-//   (resumable-edit-media URL)
-// - If |etag| should be empty or should match the etag() of the destination
-//   file.
-// TODO(hidehiko): Get rid of this struct by splitting the method
-// InitiateUpload into two methods, InitiateUploadNewFile and
-// InitiateUploadExistingFile.
-struct InitiateUploadParams {
-  InitiateUploadParams(UploadMode upload_mode,
-                       const std::string& title,
-                       const std::string& content_type,
-                       int64 content_length,
-                       const GURL& upload_location,
-                       const FilePath& drive_file_path,
-                       const std::string& etag);
-  ~InitiateUploadParams();
-
-  const UploadMode upload_mode;
-  const std::string title;
-  const std::string content_type;
-  const int64 content_length;
-  const GURL upload_location;
-  const FilePath drive_file_path;
-  const std::string etag;
-};
-
 // Callback type for DocumentServiceInterface::InitiateUpload.
 typedef base::Callback<void(GDataErrorCode error,
                             const GURL& upload_url)> InitiateUploadCallback;
 
 // This class provides base implementation for performing the operation for
 // initiating the upload of a file.
 // |callback| will be called with the obtained upload URL. The URL will be
 // used with operations for resuming the file uploading.
 //
 // Here's the flow of uploading:
@@ skipping 88 matching lines @@
   const DownloadActionCallback download_action_callback_;
   const GetContentCallback get_content_callback_;
   const GURL download_url_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileOperation);
 };
 
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_BASE_OPERATIONS_H_