Update To 11.40.268.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..92678f6 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;
@@ -32,10 +32,9 @@ class TypedUrlDataTypeController : public NonFrontendDataTypeController {
       ProfileSyncService* sync_service);
 
   // NonFrontendDataTypeController implementation
-  virtual syncer::ModelType type() const OVERRIDE;
-  virtual syncer::ModelSafeGroup model_safe_group() const OVERRIDE;
-  virtual void LoadModels(const ModelLoadCallback& model_load_callback)
-      OVERRIDE;
+  syncer::ModelType type() const override;
+  syncer::ModelSafeGroup model_safe_group() const override;
+  bool ReadyForStart() const override;
 
   // Invoked on the history thread to set our history backend - must be called
   // before CreateSyncComponents() is invoked.
@@ -43,15 +42,13 @@ class TypedUrlDataTypeController : public NonFrontendDataTypeController {
 
  protected:
   // NonFrontendDataTypeController interface.
-  virtual bool PostTaskOnBackendThread(
-      const tracked_objects::Location& from_here,
-      const base::Closure& task) OVERRIDE;
-  virtual ProfileSyncComponentsFactory::SyncComponents CreateSyncComponents()
-      OVERRIDE;
-  virtual void DisconnectProcessor(ChangeProcessor* processor) OVERRIDE;
+  bool PostTaskOnBackendThread(const tracked_objects::Location& from_here,
+                               const base::Closure& task) override;
+  ProfileSyncComponentsFactory::SyncComponents CreateSyncComponents() override;
+  void DisconnectProcessor(sync_driver::ChangeProcessor* processor) override;
 
  private:
-  virtual ~TypedUrlDataTypeController();
+  ~TypedUrlDataTypeController() override;
 
   void OnSavingBrowserHistoryDisabledChanged();
 
@@ -60,7 +57,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);
 };