chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h - Issue 1042803002: Drive: Move inner structures of DriveAPIService under drive namespace.

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: chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h

Issue 1042803002: Drive: Move inner structures of DriveAPIService under drive namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests. Created 5 years, 9 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_service_helper.cc ('k') | chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h

diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h

index 0582d0cb0605403166779fd15466f6c084f23904..fa6bb8df8e15bfe8df83afdff449fa015756d112 100644

--- a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h

+++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h

@@ -29,7 +29,7 @@ class FakeDriveServiceWrapper : public drive::FakeDriveService {

google_apis::CancelCallback AddNewDirectory(

const std::string& parent_resource_id,

const std::string& directory_name,

- const AddNewDirectoryOptions& options,

+ const drive::AddNewDirectoryOptions& options,

const google_apis::FileResourceCallback& callback) override;

void set_make_directory_conflict(bool enable) {

@@ -55,14 +55,14 @@ class FakeDriveUploader : public drive::DriveUploaderInterface {

const base::FilePath& local_file_path,

const std::string& title,

const std::string& content_type,

- const UploadNewFileOptions& options,

+ const drive::UploadNewFileOptions& options,

const drive::UploadCompletionCallback& callback,

const google_apis::ProgressCallback& progress_callback) override;

google_apis::CancelCallback UploadExistingFile(

const std::string& resource_id,

const base::FilePath& local_file_path,

const std::string& content_type,

- const UploadExistingFileOptions& options,

+ const drive::UploadExistingFileOptions& options,

const drive::UploadCompletionCallback& callback,

const google_apis::ProgressCallback& progress_callback) override;

google_apis::CancelCallback ResumeUploadFile(