Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / glue / typed_url_data_type_controller.h

diff --git a/src/chrome/browser/sync/glue/typed_url_data_type_controller.h b/src/chrome/browser/sync/glue/typed_url_data_type_controller.h
index ce2a786..aacc647 100644 (file)
--- a/src/chrome/browser/sync/glue/typed_url_data_type_controller.h
+++ b/src/chrome/browser/sync/glue/typed_url_data_type_controller.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_change_registrar.h"
-#include "chrome/browser/common/cancelable_request.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/sync/glue/non_frontend_data_type_controller.h"
 
 class HistoryService;
@@ -48,7 +48,8 @@ class TypedUrlDataTypeController : public NonFrontendDataTypeController {
       const base::Closure& task) OVERRIDE;
   virtual ProfileSyncComponentsFactory::SyncComponents CreateSyncComponents()
       OVERRIDE;
-  virtual void DisconnectProcessor(ChangeProcessor* processor) OVERRIDE;
+  virtual void DisconnectProcessor(
+      sync_driver::ChangeProcessor* processor) OVERRIDE;
 
  private:
   virtual ~TypedUrlDataTypeController();
@@ -60,7 +61,7 @@ class TypedUrlDataTypeController : public NonFrontendDataTypeController {
 
   // Helper object to make sure we don't leave tasks running on the history
   // thread.
-  CancelableRequestConsumerT<int, 0> cancelable_consumer_;
+  base::CancelableTaskTracker task_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(TypedUrlDataTypeController);
 };