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

trunk/src/chrome/browser/sync/test/integration/typed_urls_helper.cc

Index: trunk/src/chrome/browser/sync/test/integration/typed_urls_helper.cc
===================================================================
--- trunk/src/chrome/browser/sync/test/integration/typed_urls_helper.cc	(revision 285001)
+++ trunk/src/chrome/browser/sync/test/integration/typed_urls_helper.cc	(working copy)
@@ -145,10 +145,7 @@
   HistoryService* service = HistoryServiceFactory::GetForProfileWithoutCreating(
       test()->GetProfile(index));
   base::WaitableEvent wait_event(true, false);
-  service->ScheduleDBTask(
-      scoped_ptr<history::HistoryDBTask>(
-          new FlushHistoryDBQueueTask(&wait_event)),
-      &tracker);
+  service->ScheduleDBTask(new FlushHistoryDBQueueTask(&wait_event), &tracker);
   wait_event.Wait();
 }
 
@@ -175,10 +172,7 @@
   base::CancelableTaskTracker tracker;
   history::URLRows rows;
   base::WaitableEvent wait_event(true, false);
-  service->ScheduleDBTask(
-      scoped_ptr<history::HistoryDBTask>(
-          new GetTypedUrlsTask(&rows, &wait_event)),
-      &tracker);
+  service->ScheduleDBTask(new GetTypedUrlsTask(&rows, &wait_event), &tracker);
   wait_event.Wait();
   return rows;
 }
@@ -188,10 +182,8 @@
   base::CancelableTaskTracker tracker;
   base::WaitableEvent wait_event(true, false);
   bool found = false;
-  service->ScheduleDBTask(
-      scoped_ptr<history::HistoryDBTask>(
-          new GetUrlTask(url, row, &found, &wait_event)),
-      &tracker);
+  service->ScheduleDBTask(new GetUrlTask(url, row, &found, &wait_event),
+                          &tracker);
   wait_event.Wait();
   return found;
 }
@@ -201,10 +193,8 @@
   base::CancelableTaskTracker tracker;
   base::WaitableEvent wait_event(true, false);
   history::VisitVector visits;
-  service->ScheduleDBTask(
-      scoped_ptr<history::HistoryDBTask>(
-          new GetVisitsTask(id, &visits, &wait_event)),
-      &tracker);
+  service->ScheduleDBTask(new GetVisitsTask(id, &visits, &wait_event),
+                          &tracker);
   wait_event.Wait();
   return visits;
 }
@@ -213,10 +203,7 @@
                                     const history::VisitVector& visits) {
   base::CancelableTaskTracker tracker;
   base::WaitableEvent wait_event(true, false);
-  service->ScheduleDBTask(
-      scoped_ptr<history::HistoryDBTask>(
-          new RemoveVisitsTask(visits, &wait_event)),
-      &tracker);
+  service->ScheduleDBTask(new RemoveVisitsTask(visits, &wait_event), &tracker);
   wait_event.Wait();
 }