Revert of Change HistoryService::QueryURL to use CancelableTaskTracker

chrome/browser/search_engines/template_url_service_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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/cancelable_task_tracker.h"
 #include "base/test/mock_time_provider.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
@@ skipping 37 matching lines @@
 std::string TestSearchTermsData::GoogleBaseURLValue() const {
   return google_base_url_;
 }
 
 
 // QueryHistoryCallbackImpl ---------------------------------------------------
 
 struct QueryHistoryCallbackImpl {
   QueryHistoryCallbackImpl() : success(false) {}
 
-  void Callback(bool success,
-                const history::URLRow& row,
-                const history::VisitVector& visits) {
+  void Callback(HistoryService::Handle handle,
+                bool success,
+                const history::URLRow* row,
+                history::VisitVector* visits) {
     this->success = success;
-    if (success) {
-      this->row = row;
-      this->visits = visits;
-    }
+    if (row)
+      this->row = *row;
+    if (visits)
+      this->visits = *visits;
   }
 
   bool success;
   history::URLRow row;
   history::VisitVector visits;
 };
 
 TemplateURL* CreateKeywordWithDate(
     TemplateURLService* model,
     const std::string& short_name,
@@ skipping 974 matching lines @@
   history->AddPage(
       GURL(t_url->url_ref().ReplaceSearchTerms(
           TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("blah")))),
       base::Time::Now(), NULL, 0, GURL(), history::RedirectList(),
       content::PAGE_TRANSITION_KEYWORD, history::SOURCE_BROWSED, false);
 
   // Wait for history to finish processing the request.
   test_util_.profile()->BlockUntilHistoryProcessesPendingRequests();
 
   // Query history for the generated url.
-  base::CancelableTaskTracker tracker;
+  CancelableRequestConsumer consumer;
   QueryHistoryCallbackImpl callback;
-  history->QueryURL(GURL("http://keyword"),
-                    true,
-                    base::Bind(&QueryHistoryCallbackImpl::Callback,
-                               base::Unretained(&callback)),
-                    &tracker);
+  history->QueryURL(GURL("http://keyword"), true, &consumer,
+      base::Bind(&QueryHistoryCallbackImpl::Callback,
+                 base::Unretained(&callback)));
 
   // Wait for the request to be processed.
   test_util_.profile()->BlockUntilHistoryProcessesPendingRequests();
 
   // And make sure the url and visit were added.
   EXPECT_TRUE(callback.success);
   EXPECT_NE(0, callback.row.id());
   ASSERT_EQ(1U, callback.visits.size());
   EXPECT_EQ(content::PAGE_TRANSITION_KEYWORD_GENERATED,
       content::PageTransitionStripQualifier(callback.visits[0].transition));
@@ skipping 469 matching lines @@
   scoped_ptr<AssociatedExtensionInfo> extension_info(
       new AssociatedExtensionInfo);
   extension_info->wants_to_be_default_engine = true;
   extension_info->extension_id = "ext1";
   model()->AddExtensionControlledTURL(ext_dse, extension_info.Pass());
   EXPECT_EQ(ext_dse, model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext1")));
   EXPECT_TRUE(model()->is_default_search_managed());
   actual_managed_default = model()->GetDefaultSearchProvider();
   ExpectSimilar(expected_managed_default.get(), actual_managed_default);
 }