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

trunk/src/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ skipping 137 matching lines @@
 
 void ProfileSigninConfirmationHelper::CheckHasTypedURLs() {
   HistoryService* service =
       HistoryServiceFactory::GetForProfileWithoutCreating(profile_);
   pending_requests_++;
   if (!service) {
     ReturnResult(false);
     return;
   }
   service->ScheduleDBTask(
-      scoped_ptr<history::HistoryDBTask>(new HasTypedURLsTask(
+      new HasTypedURLsTask(
           base::Bind(&ProfileSigninConfirmationHelper::ReturnResult,
-                     base::Unretained(this)))),
+                     base::Unretained(this))),
       &task_tracker_);
 }
 
 void ProfileSigninConfirmationHelper::ReturnResult(bool result) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   // Pass |true| into the callback as soon as one of the tasks passes a
   // result of |true|, otherwise pass the last returned result.
   if (--pending_requests_ == 0 || result) {
     return_result_.Run(result);
 
@@ skipping 56 matching lines @@
     return;
   }
   // Fire asynchronous queries for profile data.
   ProfileSigninConfirmationHelper* helper =
       new ProfileSigninConfirmationHelper(profile, return_result);
   helper->CheckHasHistory(kHistoryEntriesBeforeNewProfilePrompt);
   helper->CheckHasTypedURLs();
 }
 
 }  // namespace ui