Revert of Change HistoryService::QueryURL to use CancelableTaskTracker

chrome/browser/browsing_data/browsing_data_remover_unittest.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 "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
@@ skipping 349 matching lines @@
   }
 
   // Returns true, if the given URL exists in the history service.
   bool HistoryContainsURL(const GURL& url) {
     scoped_refptr<content::MessageLoopRunner> message_loop_runner =
         new content::MessageLoopRunner;
     quit_closure_ = message_loop_runner->QuitClosure();
     history_service_->QueryURL(
         url,
         true,
+        &consumer_,
         base::Bind(&RemoveHistoryTester::SaveResultAndQuit,
-                   base::Unretained(this)),
-        &tracker_);
+                   base::Unretained(this)));
     message_loop_runner->Run();
     return query_url_success_;
   }
 
   void AddHistory(const GURL& url, base::Time time) {
     history_service_->AddPage(url, time, NULL, 0, GURL(),
         history::RedirectList(), content::PAGE_TRANSITION_LINK,
         history::SOURCE_BROWSED, false);
   }
 
  private:
   // Callback for HistoryService::QueryURL.
-  void SaveResultAndQuit(bool success,
-                         const history::URLRow&,
-                         const history::VisitVector&) {
+  void SaveResultAndQuit(HistoryService::Handle,
+                         bool success,
+                         const history::URLRow*,
+                         history::VisitVector*) {
     query_url_success_ = success;
     quit_closure_.Run();
   }
 
   // For History requests.
-  base::CancelableTaskTracker tracker_;
+  CancelableRequestConsumer consumer_;
   bool query_url_success_;
   base::Closure quit_closure_;
 
   // TestingProfile owns the history service; we shouldn't delete it.
   HistoryService* history_service_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveHistoryTester);
 };
 
 class RemoveAutofillTester : public autofill::PersonalDataManagerObserver {
@@ skipping 1265 matching lines @@
 }
 
 TEST_F(BrowsingDataRemoverTest, DomainReliability_Contexts_ProtectedOrigins) {
   DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor();
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_COOKIES, true);
   EXPECT_TRUE(monitor->was_cleared_for_testing());
   EXPECT_EQ(CLEAR_CONTEXTS, monitor->cleared_mode_for_testing());
 }