| 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 87d3019bbe55ea7064e7c2ee2ec9807d264c30ed..e11d7bcd7336151beeb496a69f959049db5b5084 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,15 +67,17 @@ FakeDriveServiceWrapper::~FakeDriveServiceWrapper() {}
|
| CancelCallback FakeDriveServiceWrapper::AddNewDirectory(
|
| const std::string& parent_resource_id,
|
| const std::string& directory_name,
|
| + const AddNewDirectoryOptions& options,
|
| const GetResourceEntryCallback& callback) {
|
| if (make_directory_conflict_) {
|
| FakeDriveService::AddNewDirectory(
|
| parent_resource_id,
|
| directory_name,
|
| + options,
|
| base::Bind(&DidAddFileOrDirectoryForMakingConflict));
|
| }
|
| return FakeDriveService::AddNewDirectory(
|
| - parent_resource_id, directory_name, callback);
|
| + parent_resource_id, directory_name, options, callback);
|
| }
|
|
|
| FakeDriveUploader::FakeDriveUploader(
|
|
|