| Index: chrome/browser/sync_file_system/sync_file_system_service.h
|
| diff --git a/chrome/browser/sync_file_system/sync_file_system_service.h b/chrome/browser/sync_file_system/sync_file_system_service.h
|
| index d9435cd97025d8f78448bbaf65051eaab25c0ea5..78b4f5b4c90562efa4a2522ccd57a4f2f3e4c5f1 100644
|
| --- a/chrome/browser/sync_file_system/sync_file_system_service.h
|
| +++ b/chrome/browser/sync_file_system/sync_file_system_service.h
|
| @@ -32,7 +32,7 @@ namespace storage {
|
| class FileSystemContext;
|
| }
|
|
|
| -namespace sync_driver {
|
| +namespace syncer {
|
| class SyncService;
|
| }
|
|
|
| @@ -46,7 +46,7 @@ class SyncEventObserver;
|
| class SyncFileSystemService
|
| : public KeyedService,
|
| public SyncProcessRunner::Client,
|
| - public sync_driver::SyncServiceObserver,
|
| + public syncer::SyncServiceObserver,
|
| public FileStatusObserver,
|
| public extensions::ExtensionRegistryObserver,
|
| public base::SupportsWeakPtr<SyncFileSystemService> {
|
| @@ -147,7 +147,7 @@ class SyncFileSystemService
|
| void OnExtensionLoaded(content::BrowserContext* browser_context,
|
| const extensions::Extension* extension) override;
|
|
|
| - // sync_driver::SyncServiceObserver implementation.
|
| + // syncer::SyncServiceObserver implementation.
|
| void OnStateChanged() override;
|
|
|
| // SyncFileStatusObserver implementation.
|
| @@ -160,7 +160,7 @@ class SyncFileSystemService
|
| // Check the profile's sync preference settings and call
|
| // remote_file_service_->SetSyncEnabled() to update the status.
|
| // |profile_sync_service| must be non-null.
|
| - void UpdateSyncEnabledStatus(sync_driver::SyncService* profile_sync_service);
|
| + void UpdateSyncEnabledStatus(syncer::SyncService* profile_sync_service);
|
|
|
| // Runs the SyncProcessRunner method of all sync runners (e.g. for Local sync
|
| // and Remote sync).
|
|
|