chrome/browser/sync/glue/history_model_worker.h - Issue 352913002: Port HistoryService::ScheduleDBTask to CancelableTaskTracker

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/glue/history_model_worker.h

Issue 352913002: Port HistoryService::ScheduleDBTask to CancelableTaskTracker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix lifetime of base::CancelableTaskTracker for HistoryModelWorker Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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..2488a67233b393cd68ae11a322b92f9d613320dd 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_;

+ scoped_ptr<base::CancelableTaskTracker> cancelable_tracker_;

DISALLOW_COPY_AND_ASSIGN(HistoryModelWorker);

};