chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc - 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_service_helper.cc

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/drive_uploader_wrapper.cc ('k') | chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h » ('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_service_helper.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc b/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc

index 9e1b1b0a8f02abb4cd3fb5762f175e90ddf29164..b993415127a91ea862ff4c16ecdc9b5a0837fc03 100644

--- a/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc

+++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc

@@ -85,10 +85,9 @@ DriveApiErrorCode FakeDriveServiceHelper::AddFolder(

std::string* folder_id) {

DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;

scoped_ptr<FileResource> folder;

- fake_drive_service_->AddNewDirectory(

- parent_folder_id, title,

- drive::DriveServiceInterface::AddNewDirectoryOptions(),

- CreateResultReceiver(&error, &folder));

+ fake_drive_service_->AddNewDirectory(parent_folder_id, title,

+ drive::AddNewDirectoryOptions(),

+ CreateResultReceiver(&error, &folder));

base::RunLoop().RunUntilIdle();

if (error == google_apis::HTTP_CREATED && folder_id)

@@ -106,9 +105,8 @@ DriveApiErrorCode FakeDriveServiceHelper::AddFile(

DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;

scoped_ptr<FileResource> file;

drive_uploader_->UploadNewFile(

- parent_folder_id, temp_file, title,

- "application/octet-stream",

- drive::DriveUploader::UploadNewFileOptions(),

+ parent_folder_id, temp_file, title, "application/octet-stream",

+ drive::UploadNewFileOptions(),

base::Bind(&UploadResultCallback, &error, &file),

google_apis::ProgressCallback());

base::RunLoop().RunUntilIdle();

@@ -125,9 +123,8 @@ DriveApiErrorCode FakeDriveServiceHelper::UpdateFile(

DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;

scoped_ptr<FileResource> file;

drive_uploader_->UploadExistingFile(

- file_id, temp_file,

- "application/octet-stream",

- drive::DriveUploader::UploadExistingFileOptions(),

+ file_id, temp_file, "application/octet-stream",

+ drive::UploadExistingFileOptions(),

base::Bind(&UploadResultCallback, &error, &file),

google_apis::ProgressCallback());

base::RunLoop().RunUntilIdle();