google_apis/drive/drive_api_requests.cc - Issue 1138883004: Revert of Revert of Drive: Let DriveUploader use batch request API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: google_apis/drive/drive_api_requests.cc

Issue 1138883004: Revert of Revert of Drive: Let DriveUploader use batch request API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc ('k') | google_apis/drive/drive_api_requests_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: google_apis/drive/drive_api_requests.cc

diff --git a/google_apis/drive/drive_api_requests.cc b/google_apis/drive/drive_api_requests.cc

index d770f4bb5304ec4b09da81b124bc979b48d87244..0b5b7229699b25e61285b86d64491c6bfed2495b 100644

--- a/google_apis/drive/drive_api_requests.cc

+++ b/google_apis/drive/drive_api_requests.cc

@@ -1211,9 +1211,12 @@

void BatchUploadRequest::Commit() {

DCHECK(CalledOnValidThread());

DCHECK(!committed_);

- CHECK(!child_requests_.empty());

- committed_ = true;

- MayCompletePrepare();

+ if (child_requests_.empty()) {

+ Cancel();

+ } else {

+ committed_ = true;

+ MayCompletePrepare();

+ }

}

void BatchUploadRequest::Prepare(const PrepareCallback& callback) {