| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h" | 5 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 } // namespace | 60 } // namespace |
| 61 | 61 |
| 62 FakeDriveServiceWrapper::FakeDriveServiceWrapper() | 62 FakeDriveServiceWrapper::FakeDriveServiceWrapper() |
| 63 : make_directory_conflict_(false) {} | 63 : make_directory_conflict_(false) {} |
| 64 | 64 |
| 65 FakeDriveServiceWrapper::~FakeDriveServiceWrapper() {} | 65 FakeDriveServiceWrapper::~FakeDriveServiceWrapper() {} |
| 66 | 66 |
| 67 CancelCallback FakeDriveServiceWrapper::AddNewDirectory( | 67 CancelCallback FakeDriveServiceWrapper::AddNewDirectory( |
| 68 const std::string& parent_resource_id, | 68 const std::string& parent_resource_id, |
| 69 const std::string& directory_name, | 69 const std::string& directory_name, |
| 70 const AddNewDirectoryOptions& options, |
| 70 const GetResourceEntryCallback& callback) { | 71 const GetResourceEntryCallback& callback) { |
| 71 if (make_directory_conflict_) { | 72 if (make_directory_conflict_) { |
| 72 FakeDriveService::AddNewDirectory( | 73 FakeDriveService::AddNewDirectory( |
| 73 parent_resource_id, | 74 parent_resource_id, |
| 74 directory_name, | 75 directory_name, |
| 76 options, |
| 75 base::Bind(&DidAddFileOrDirectoryForMakingConflict)); | 77 base::Bind(&DidAddFileOrDirectoryForMakingConflict)); |
| 76 } | 78 } |
| 77 return FakeDriveService::AddNewDirectory( | 79 return FakeDriveService::AddNewDirectory( |
| 78 parent_resource_id, directory_name, callback); | 80 parent_resource_id, directory_name, options, callback); |
| 79 } | 81 } |
| 80 | 82 |
| 81 FakeDriveUploader::FakeDriveUploader( | 83 FakeDriveUploader::FakeDriveUploader( |
| 82 FakeDriveServiceWrapper* fake_drive_service) | 84 FakeDriveServiceWrapper* fake_drive_service) |
| 83 : fake_drive_service_(fake_drive_service), | 85 : fake_drive_service_(fake_drive_service), |
| 84 make_file_conflict_(false) {} | 86 make_file_conflict_(false) {} |
| 85 | 87 |
| 86 FakeDriveUploader::~FakeDriveUploader() {} | 88 FakeDriveUploader::~FakeDriveUploader() {} |
| 87 | 89 |
| 88 CancelCallback FakeDriveUploader::UploadNewFile( | 90 CancelCallback FakeDriveUploader::UploadNewFile( |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 const UploadCompletionCallback& callback, | 140 const UploadCompletionCallback& callback, |
| 139 const ProgressCallback& progress_callback) { | 141 const ProgressCallback& progress_callback) { |
| 140 // At the moment, sync file system doesn't support resuming of the uploading. | 142 // At the moment, sync file system doesn't support resuming of the uploading. |
| 141 // So this method shouldn't be reached. | 143 // So this method shouldn't be reached. |
| 142 NOTREACHED(); | 144 NOTREACHED(); |
| 143 return CancelCallback(); | 145 return CancelCallback(); |
| 144 } | 146 } |
| 145 | 147 |
| 146 } // namespace drive_backend | 148 } // namespace drive_backend |
| 147 } // namespace sync_file_system | 149 } // namespace sync_file_system |
| OLD | NEW |