Split InitiateUpload method into two.

Split InitiateUpload method into two.

This is the preparation to replace upload urls to resource ids.
After this CL, InitiateUploadXXX methods can be supported on Drive API v2.

BUG=148632
TEST=Ran unit_tests


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=182356

[hidehiko, 2013-02-08 09:31:05]

Thank you for your review in advnace,
- hidehiko

[kinaba, 2013-02-08 10:04:06]

lgtm

[hashimoto, 2013-02-08 10:14:57]

lgtm with a nit

https://codereview.chromium.org/12207075/diff/2001/chrome/browser/google_apis...
File chrome/browser/google_apis/gdata_wapi_service.cc (right):

https://codereview.chromium.org/12207075/diff/2001/chrome/browser/google_apis...
chrome/browser/google_apis/gdata_wapi_service.cc:421: if
(parent_upload_url.is_empty()) {
nit: DriveUploader is DCHECKing that url is not empty.
How about just DCHECKing here too?
The same goes for the existing case.

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

Noticed another nit.

https://codereview.chromium.org/12207075/diff/4004/chrome/browser/google_apis...
File chrome/browser/google_apis/base_operations.h (right):

https://codereview.chromium.org/12207075/diff/4004/chrome/browser/google_apis...
chrome/browser/google_apis/base_operations.h:15: #include
"chrome/browser/google_apis/drive_upload_mode.h"
nit: no need to include this anymore.

[hidehiko, 2013-02-08 12:01:49]

Thank you for your review.

https://codereview.chromium.org/12207075/diff/2001/chrome/browser/google_apis...
File chrome/browser/google_apis/gdata_wapi_service.cc (right):

https://codereview.chromium.org/12207075/diff/2001/chrome/browser/google_apis...
chrome/browser/google_apis/gdata_wapi_service.cc:421: if
(parent_upload_url.is_empty()) {
On 2013/02/08 10:14:57, hashimoto wrote:
> nit: DriveUploader is DCHECKing that url is not empty.
> How about just DCHECKing here too?
> The same goes for the existing case.

Can I keep this as is at the moment, because I'm about sending another CL to
remove this?

https://codereview.chromium.org/12207075/diff/4004/chrome/browser/google_apis...
File chrome/browser/google_apis/base_operations.h (right):

https://codereview.chromium.org/12207075/diff/4004/chrome/browser/google_apis...
chrome/browser/google_apis/base_operations.h:15: #include
"chrome/browser/google_apis/drive_upload_mode.h"
On 2013/02/08 11:34:02, hashimoto wrote:
> nit: no need to include this anymore.

Done.

[hashimoto, 2013-02-08 12:45:02]

https://codereview.chromium.org/12207075/diff/2001/chrome/browser/google_apis...
File chrome/browser/google_apis/gdata_wapi_service.cc (right):

https://codereview.chromium.org/12207075/diff/2001/chrome/browser/google_apis...
chrome/browser/google_apis/gdata_wapi_service.cc:421: if
(parent_upload_url.is_empty()) {
On 2013/02/08 12:01:50, hidehiko wrote:
> On 2013/02/08 10:14:57, hashimoto wrote:
> > nit: DriveUploader is DCHECKing that url is not empty.
> > How about just DCHECKing here too?
> > The same goes for the existing case.
> 
> Can I keep this as is at the moment, because I'm about sending another CL to
> remove this?

OK.
Please go ahead.

[commit-bot: I haz the power, 2013-02-12 05:01:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hidehiko@chromium.org/12207075/3017

[commit-bot: I haz the power, 2013-02-12 05:01:39]

Failed to apply patch for chrome/browser/google_apis/base_operations.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/google_apis/base_operations.cc
  Hunk #1 FAILED at 374.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/google_apis/base_operations.cc.rej

Patch:       chrome/browser/google_apis/base_operations.cc
Index: chrome/browser/google_apis/base_operations.cc
diff --git a/chrome/browser/google_apis/base_operations.cc
b/chrome/browser/google_apis/base_operations.cc
index
510e084f4a78f90c3b1b07a764e2c2be96fa17a1..148e33cf4084bc3b17a671592c0284cacb503e5c
100644
--- a/chrome/browser/google_apis/base_operations.cc
+++ b/chrome/browser/google_apis/base_operations.cc
@@ -374,26 +374,6 @@ void GetDataOperation::RunCallbackOnSuccess(GDataErrorCode
fetch_error_code,
 
 //========================= InitiateUploadOperationBase
========================
 
-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)
-    : upload_mode(upload_mode),
-      title(title),
-      content_type(content_type),
-      content_length(content_length),
-      upload_location(upload_location),
-      drive_file_path(drive_file_path),
-      etag(etag) {
-}
-
-InitiateUploadParams::~InitiateUploadParams() {
-}
-
 InitiateUploadOperationBase::InitiateUploadOperationBase(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,

[commit-bot: I haz the power, 2013-02-12 05:25:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hidehiko@chromium.org/12207075/6002

[commit-bot: I haz the power, 2013-02-12 06:30:17]

Retried try job too often on mac_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-02-12 06:30:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hidehiko@chromium.org/12207075/6002

[commit-bot: I haz the power, 2013-02-12 07:59:02]

Retried try job too often on mac_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-02-12 07:59:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hidehiko@chromium.org/12207075/6002

[satorux1, 2013-02-12 09:47:11]

This patch is a bit worrisome as it's large thus could make merging fixes to M26
difficult. However, it's probably OK as we rarely had serious issues in this
layer...

[commit-bot: I haz the power, 2013-02-13 19:30:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hidehiko@chromium.org/12207075/6002

[commit-bot: I haz the power, 2013-02-14 00:54:14]

Change committed as 182356