| Index: chrome/browser/sync/glue/history_model_worker.h
|
| diff --git a/chrome/browser/sync/glue/history_model_worker.h b/chrome/browser/sync/glue/history_model_worker.h
|
| index 0f555697b26ab9f25759bd03d4535e8b4ea794e6..e8b0f7457f47b33b74e358c8f1721189f26ee69b 100644
|
| --- a/chrome/browser/sync/glue/history_model_worker.h
|
| +++ b/chrome/browser/sync/glue/history_model_worker.h
|
| @@ -12,7 +12,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "chrome/browser/common/cancelable_request.h"
|
| +#include "base/task/cancelable_task_tracker.h"
|
| #include "chrome/browser/history/history_db_task.h"
|
| #include "chrome/browser/history/history_service.h"
|
|
|
| @@ -46,7 +46,7 @@ class HistoryModelWorker : public syncer::ModelSafeWorker {
|
| const base::WeakPtr<HistoryService> history_service_;
|
| // Helper object to make sure we don't leave tasks running on the history
|
| // thread.
|
| - CancelableRequestConsumerT<int, 0> cancelable_consumer_;
|
| + base::CancelableTaskTracker cancelable_tracker_;
|
| DISALLOW_COPY_AND_ASSIGN(HistoryModelWorker);
|
| };
|
|
|
|
|