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

trunk/src/chrome/browser/history/history_browsertest.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 69 matching lines @@
   }
 
   GURL GetTestUrl() {
     return ui_test_utils::GetTestUrl(
         base::FilePath(base::FilePath::kCurrentDirectory),
         base::FilePath(FILE_PATH_LITERAL("title2.html")));
   }
 
   void WaitForHistoryBackendToRun() {
     base::CancelableTaskTracker task_tracker;
-    scoped_ptr<history::HistoryDBTask> task(new WaitForHistoryTask());
+    scoped_refptr<history::HistoryDBTask> task(new WaitForHistoryTask());
     HistoryService* history =
         HistoryServiceFactory::GetForProfile(GetProfile(),
                                              Profile::EXPLICIT_ACCESS);
-    history->HistoryService::ScheduleDBTask(task.Pass(), &task_tracker);
+    history->HistoryService::ScheduleDBTask(task.get(), &task_tracker);
     content::RunMessageLoop();
   }
 
   void ExpectEmptyHistory() {
     std::vector<GURL> urls(GetHistoryContents());
     EXPECT_EQ(0U, urls.size());
   }
 
   void LoadAndWaitForURL(const GURL& url) {
     base::string16 expected_title(base::ASCIIToUTF16("OK"));
@@ skipping 397 matching lines @@
 
   content::WebContents* active_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_EQ(web_contents, active_web_contents);
   ASSERT_EQ(history_url, active_web_contents->GetURL());
 
   content::WebContents* second_tab =
       browser()->tab_strip_model()->GetWebContentsAt(1);
   ASSERT_NE(history_url, second_tab->GetURL());
 }