| Index: chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
|
| index 33694dd4784279cb8e3ce6aa2f395707ab2176ff..1441d93a6db347b6c1b7974412b464e71e2beb16 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
|
| @@ -31,7 +31,7 @@ DriveServiceOnWorker::~DriveServiceOnWorker() {}
|
| google_apis::CancelCallback DriveServiceOnWorker::AddNewDirectory(
|
| const std::string& parent_resource_id,
|
| const std::string& directory_title,
|
| - const AddNewDirectoryOptions& options,
|
| + const drive::AddNewDirectoryOptions& options,
|
| const google_apis::FileResourceCallback& callback) {
|
| DCHECK(sequence_checker_.CalledOnValidSequencedThread());
|
|
|
| @@ -338,7 +338,7 @@ google_apis::CancelCallback DriveServiceOnWorker::InitiateUploadNewFile(
|
| int64 content_length,
|
| const std::string& parent_resource_id,
|
| const std::string& title,
|
| - const UploadNewFileOptions& options,
|
| + const drive::UploadNewFileOptions& options,
|
| const google_apis::InitiateUploadCallback& callback) {
|
| NOTREACHED();
|
| return google_apis::CancelCallback();
|
| @@ -348,7 +348,7 @@ google_apis::CancelCallback DriveServiceOnWorker::InitiateUploadExistingFile(
|
| const std::string& content_type,
|
| int64 content_length,
|
| const std::string& resource_id,
|
| - const UploadExistingFileOptions& options,
|
| + const drive::UploadExistingFileOptions& options,
|
| const google_apis::InitiateUploadCallback& callback) {
|
| NOTREACHED();
|
| return google_apis::CancelCallback();
|
| @@ -381,7 +381,7 @@ google_apis::CancelCallback DriveServiceOnWorker::MultipartUploadNewFile(
|
| const std::string& parent_resource_id,
|
| const std::string& title,
|
| const base::FilePath& local_file_path,
|
| - const UploadNewFileOptions& options,
|
| + const drive::UploadNewFileOptions& options,
|
| const google_apis::FileResourceCallback& callback,
|
| const google_apis::ProgressCallback& progress_callback) {
|
| NOTREACHED();
|
| @@ -393,7 +393,7 @@ google_apis::CancelCallback DriveServiceOnWorker::MultipartUploadExistingFile(
|
| int64 content_length,
|
| const std::string& parent_resource_id,
|
| const base::FilePath& local_file_path,
|
| - const UploadExistingFileOptions& options,
|
| + const drive::UploadExistingFileOptions& options,
|
| const google_apis::FileResourceCallback& callback,
|
| const google_apis::ProgressCallback& progress_callback) {
|
| NOTREACHED();
|
|
|