Chromium Code Reviews| Index: chrome/browser/sync_file_system/drive_backend/sync_engine.h |
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.h b/chrome/browser/sync_file_system/drive_backend/sync_engine.h |
| index 45bf4b344f379ca6fd622d7161cf8c0958ba235b..f9dbf4d5a329fc67e52e52bd130029ae47d50478 100644 |
| --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.h |
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.h |
| @@ -121,7 +121,11 @@ class SyncEngine : public RemoteFileSyncService, |
| drive::DriveServiceInterface* GetDriveService(); |
| drive::DriveUploaderInterface* GetDriveUploader(); |
| - MetadataDatabase* GetMetadataDatabase(); |
| + |
| + // NOTICE: Basically, metadata database runs on |worker_task_runner_|. |
| + // Handling it through GetMetadataDatabaseForTesting() in the main thread |
| + // may bring race condition. |
|
tzik
2014/05/29 02:31:09
I believe we should convert SyncEngineTest to Sync
peria
2014/05/29 03:11:46
I filed a bug crbug.com/378621. How about leaving
|
| + MetadataDatabase* GetMetadataDatabaseForTesting(); |
| SyncTaskManager* GetSyncTaskManagerForTesting(); |
| void OnPendingFileListUpdated(int item_count); |
| @@ -131,6 +135,7 @@ class SyncEngine : public RemoteFileSyncService, |
| SyncDirection direction); |
| void UpdateServiceState(RemoteServiceState state, |
| const std::string& description); |
| + void DidPromoteDemotedChanges(size_t num_trackers); |
| private: |
| class WorkerObserver; |
| @@ -145,7 +150,7 @@ class SyncEngine : public RemoteFileSyncService, |
| ExtensionServiceInterface* extension_service, |
| SigninManagerBase* signin_manager); |
| - void UpdateRegisteredApps(); |
| + void UpdateRegisteredAppsForTesting(); |
| scoped_ptr<drive::DriveServiceInterface> drive_service_; |
| scoped_ptr<DriveServiceWrapper> drive_service_wrapper_; |