Revert 284958 "Make HistoryDBTask not refcounted, and ensure it'..."

trunk/src/chrome/browser/sync/glue/history_model_worker.cc

Index: trunk/src/chrome/browser/sync/glue/history_model_worker.cc
===================================================================
--- trunk/src/chrome/browser/sync/glue/history_model_worker.cc	(revision 285001)
+++ trunk/src/chrome/browser/sync/glue/history_model_worker.cc	(working copy)
@@ -71,8 +71,8 @@
                     syncer::SyncerError* error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (history_service.get()) {
-    scoped_ptr<history::HistoryDBTask> task(new WorkerTask(work, done, error));
-    history_service->ScheduleDBTask(task.Pass(), cancelable_tracker);
+    scoped_refptr<WorkerTask> task(new WorkerTask(work, done, error));
+    history_service->ScheduleDBTask(task.get(), cancelable_tracker);
   } else {
     *error = syncer::CANNOT_DO_WORK;
     done->Signal();
@@ -94,8 +94,8 @@
 void HistoryModelWorker::RegisterForLoopDestruction() {
   CHECK(history_service_.get());
   history_service_->ScheduleDBTask(
-      scoped_ptr<history::HistoryDBTask>(new AddDBThreadObserverTask(
-          base::Bind(&HistoryModelWorker::RegisterOnDBThread, this))),
+      new AddDBThreadObserverTask(
+          base::Bind(&HistoryModelWorker::RegisterOnDBThread, this)),
       cancelable_tracker_.get());
 }