Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2296)

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

Issue 387923002: Make HistoryDBTask not refcounted, and ensure it's destroyed on its origin thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert unnecessary changes Created 6 years, 5 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/history_model_worker.cc
diff --git a/chrome/browser/sync/glue/history_model_worker.cc b/chrome/browser/sync/glue/history_model_worker.cc
index 39b86263bb3e150ef7d01df8760fa0d51a76c5e5..179637b33f52b62c7cb68457cd80bf6555348708 100644
--- a/chrome/browser/sync/glue/history_model_worker.cc
+++ b/chrome/browser/sync/glue/history_model_worker.cc
@@ -71,8 +71,8 @@ void PostWorkerTask(const base::WeakPtr<HistoryService>& history_service,
syncer::SyncerError* error) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (history_service.get()) {
- scoped_refptr<WorkerTask> task(new WorkerTask(work, done, error));
- history_service->ScheduleDBTask(task.get(), cancelable_tracker);
+ scoped_ptr<history::HistoryDBTask> task(new WorkerTask(work, done, error));
+ history_service->ScheduleDBTask(task.Pass(), cancelable_tracker);
} else {
*error = syncer::CANNOT_DO_WORK;
done->Signal();
@@ -94,8 +94,8 @@ HistoryModelWorker::HistoryModelWorker(
void HistoryModelWorker::RegisterForLoopDestruction() {
CHECK(history_service_.get());
history_service_->ScheduleDBTask(
- new AddDBThreadObserverTask(
- base::Bind(&HistoryModelWorker::RegisterOnDBThread, this)),
+ scoped_ptr<history::HistoryDBTask>(new AddDBThreadObserverTask(
+ base::Bind(&HistoryModelWorker::RegisterOnDBThread, this))),
cancelable_tracker_.get());
}
« no previous file with comments | « chrome/browser/prerender/prerender_local_predictor.cc ('k') | chrome/browser/sync/glue/typed_url_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698