1 files changed, 11 insertions, 14 deletions

diff --git a/chromium/components/history/core/browser/history_delete_directives_data_type_controller.h b/chromium/components/history/core/browser/history_delete_directives_data_type_controller.h
index 0e79187eafc..07016e763b6 100644
--- a/chromium/components/history/core/browser/history_delete_directives_data_type_controller.h
+++ b/chromium/components/history/core/browser/history_delete_directives_data_type_controller.h
@@ -6,40 +6,37 @@
 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_DELETE_DIRECTIVES_DATA_TYPE_CONTROLLER_H_
 
 #include "base/macros.h"
-#include "components/sync_driver/local_device_info_provider.h"
-#include "components/sync_driver/sync_service_observer.h"
-#include "components/sync_driver/ui_data_type_controller.h"
+#include "components/sync/device_info/local_device_info_provider.h"
+#include "components/sync/driver/sync_service_observer.h"
+#include "components/sync/driver/ui_data_type_controller.h"
 
 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:
-  HistoryDeleteDirectivesDataTypeController(
-      const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
-      const base::Closure& error_callback,
-      sync_driver::SyncClient* sync_client);
+  // |dump_stack| is called when an unrecoverable error occurs.
+  HistoryDeleteDirectivesDataTypeController(const base::Closure& dump_stack,
+                                            syncer::SyncClient* sync_client);
+  ~HistoryDeleteDirectivesDataTypeController() override;
 
   // UIDataTypeController override.
   bool ReadyForStart() const override;
   bool StartModels() override;
   void StopModels() override;
 
-  // sync_driver::SyncServiceObserver implementation.
+  // syncer::SyncServiceObserver implementation.
   void OnStateChanged() override;
 
  private:
-  // Refcounted.
-  ~HistoryDeleteDirectivesDataTypeController() override;
-
   // Triggers a SingleDataTypeUnrecoverable error and returns true if the
   // 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);
 };