| Index: components/history/core/browser/history_delete_directives_data_type_controller.h
|
| diff --git a/components/history/core/browser/history_delete_directives_data_type_controller.h b/components/history/core/browser/history_delete_directives_data_type_controller.h
|
| index 66cd6ad86f2c7c46b48d7a722a646fb779aa64da..07016e763b69cd2915d622561c11c9b503953646 100644
|
| --- a/components/history/core/browser/history_delete_directives_data_type_controller.h
|
| +++ b/components/history/core/browser/history_delete_directives_data_type_controller.h
|
| @@ -15,13 +15,12 @@ namespace browser_sync {
|
| // A controller for delete directives, which cannot sync when full encryption
|
| // is enabled.
|
| class HistoryDeleteDirectivesDataTypeController
|
| - : public sync_driver::UIDataTypeController,
|
| - public sync_driver::SyncServiceObserver {
|
| + : public syncer::UIDataTypeController,
|
| + public syncer::SyncServiceObserver {
|
| public:
|
| // |dump_stack| is called when an unrecoverable error occurs.
|
| - HistoryDeleteDirectivesDataTypeController(
|
| - const base::Closure& dump_stack,
|
| - sync_driver::SyncClient* sync_client);
|
| + HistoryDeleteDirectivesDataTypeController(const base::Closure& dump_stack,
|
| + syncer::SyncClient* sync_client);
|
| ~HistoryDeleteDirectivesDataTypeController() override;
|
|
|
| // UIDataTypeController override.
|
| @@ -29,7 +28,7 @@ class HistoryDeleteDirectivesDataTypeController
|
| bool StartModels() override;
|
| void StopModels() override;
|
|
|
| - // sync_driver::SyncServiceObserver implementation.
|
| + // syncer::SyncServiceObserver implementation.
|
| void OnStateChanged() override;
|
|
|
| private:
|
| @@ -37,7 +36,7 @@ class HistoryDeleteDirectivesDataTypeController
|
| // type is no longer ready, else does nothing and returns false.
|
| bool DisableTypeIfNecessary();
|
|
|
| - sync_driver::SyncClient* sync_client_;
|
| + syncer::SyncClient* sync_client_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HistoryDeleteDirectivesDataTypeController);
|
| };
|
|
|