| 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 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ | 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ |
| 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ | 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 class FakeDriveServiceWrapper : public drive::FakeDriveService { | 23 class FakeDriveServiceWrapper : public drive::FakeDriveService { |
| 24 public: | 24 public: |
| 25 FakeDriveServiceWrapper(); | 25 FakeDriveServiceWrapper(); |
| 26 virtual ~FakeDriveServiceWrapper(); | 26 virtual ~FakeDriveServiceWrapper(); |
| 27 | 27 |
| 28 // DriveServiceInterface overrides. | 28 // DriveServiceInterface overrides. |
| 29 virtual google_apis::CancelCallback AddNewDirectory( | 29 virtual google_apis::CancelCallback AddNewDirectory( |
| 30 const std::string& parent_resource_id, | 30 const std::string& parent_resource_id, |
| 31 const std::string& directory_name, | 31 const std::string& directory_name, |
| 32 const AddNewDirectoryOptions& options, |
| 32 const google_apis::GetResourceEntryCallback& callback) OVERRIDE; | 33 const google_apis::GetResourceEntryCallback& callback) OVERRIDE; |
| 33 | 34 |
| 34 void set_make_directory_conflict(bool enable) { | 35 void set_make_directory_conflict(bool enable) { |
| 35 make_directory_conflict_ = enable; | 36 make_directory_conflict_ = enable; |
| 36 } | 37 } |
| 37 | 38 |
| 38 private: | 39 private: |
| 39 bool make_directory_conflict_; | 40 bool make_directory_conflict_; |
| 40 | 41 |
| 41 DISALLOW_COPY_AND_ASSIGN(FakeDriveServiceWrapper); | 42 DISALLOW_COPY_AND_ASSIGN(FakeDriveServiceWrapper); |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 FakeDriveServiceWrapper* fake_drive_service_; | 80 FakeDriveServiceWrapper* fake_drive_service_; |
| 80 bool make_file_conflict_; | 81 bool make_file_conflict_; |
| 81 | 82 |
| 82 DISALLOW_COPY_AND_ASSIGN(FakeDriveUploader); | 83 DISALLOW_COPY_AND_ASSIGN(FakeDriveUploader); |
| 83 }; | 84 }; |
| 84 | 85 |
| 85 } // namespace drive_backend | 86 } // namespace drive_backend |
| 86 } // namespace sync_file_system | 87 } // namespace sync_file_system |
| 87 | 88 |
| 88 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ | 89 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ |
| OLD | NEW |