Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6222)

Unified Diff: chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.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
Index: chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
index e19c1af5041da3355d13036922b6440203e02870..f0d30ad42ee1fee9d003f5c96e0afbe5b0655f32 100644
--- a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
+++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
@@ -67,7 +67,7 @@ FakeDriveServiceWrapper::~FakeDriveServiceWrapper() {}
CancelCallback FakeDriveServiceWrapper::AddNewDirectory(
const std::string& parent_resource_id,
const std::string& directory_name,
- const AddNewDirectoryOptions& options,
+ const drive::AddNewDirectoryOptions& options,
const FileResourceCallback& callback) {
if (make_directory_conflict_) {
FakeDriveService::AddNewDirectory(
@@ -92,7 +92,7 @@ CancelCallback FakeDriveUploader::UploadNewFile(
const base::FilePath& local_file_path,
const std::string& title,
const std::string& content_type,
- const UploadNewFileOptions& options,
+ const drive::UploadNewFileOptions& options,
const UploadCompletionCallback& callback,
const ProgressCallback& progress_callback) {
DCHECK(!callback.is_null());
@@ -124,7 +124,7 @@ CancelCallback FakeDriveUploader::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 UploadCompletionCallback& callback,
const ProgressCallback& progress_callback) {
DCHECK(!callback.is_null());
@@ -137,7 +137,7 @@ CancelCallback FakeDriveUploader::ResumeUploadFile(
const GURL& upload_location,
const base::FilePath& local_file_path,
const std::string& content_type,
- const UploadCompletionCallback& callback,
+ const drive::UploadCompletionCallback& callback,
const ProgressCallback& progress_callback) {
// At the moment, sync file system doesn't support resuming of the uploading.
// So this method shouldn't be reached.

Powered by Google App Engine
This is Rietveld 408576698