Port HistoryService::QueryRedirects{From,To} to CancelableTaskTracker

chrome/browser/history/redirect_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.
 
 // Navigates the browser to server and client redirect pages and makes sure
 // that the correct redirects are reflected in the history database. Errors
 // here might indicate that WebKit changed the calls our glue layer gets in
 // the case of redirects. It may also mean problems with the history system.
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 11 matching lines @@
   std::vector<GURL> GetRedirects(const GURL& url) {
     HistoryService* history_service =
         HistoryServiceFactory::GetForProfile(browser()->profile(),
                                              Profile::EXPLICIT_ACCESS);
 
     // Schedule a history query for redirects. The response will be sent
     // asynchronously from the callback the history system uses to notify us
     // that it's done: OnRedirectQueryComplete.
     std::vector<GURL> rv;
     history_service->QueryRedirectsFrom(
-        url, &consumer_,
+        url,
         base::Bind(&RedirectTest::OnRedirectQueryComplete,
-                   base::Unretained(this), &rv));
+                   base::Unretained(this),
+                   &rv),
+        &tracker_);
     content::RunMessageLoop();
     return rv;
   }
 
  protected:
-  void OnRedirectQueryComplete(
-      std::vector<GURL>* rv,
-      HistoryService::Handle request_handle,
-      GURL from_url,
-      bool success,
-      history::RedirectList* redirects) {
-    for (size_t i = 0; i < redirects->size(); ++i)
-      rv->push_back(redirects->at(i));
+  void OnRedirectQueryComplete(std::vector<GURL>* rv,
+                               const history::RedirectList* redirects) {
+    rv->insert(rv->end(), redirects->begin(), redirects->end());
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
   }
 
-  // Consumer for asynchronous history queries.
-  CancelableRequestConsumer consumer_;
+  // Tracker for asynchronous history queries.
+  base::CancelableTaskTracker tracker_;
 };
 
 // Tests a single server redirect
 IN_PROC_BROWSER_TEST_F(RedirectTest, Server) {
   ASSERT_TRUE(test_server()->Start());
   GURL final_url = test_server()->GetURL(std::string());
   GURL first_url = test_server()->GetURL(
       "server-redirect?" + final_url.spec());
 
   ui_test_utils::NavigateToURL(browser(), first_url);
@@ skipping 219 matching lines @@
   // as a client redirect from the first (/client-redirect?) page.
   for (std::vector<GURL>::iterator it = redirects.begin();
        it != redirects.end(); ++it) {
     if (final_url.spec() == it->spec()) {
       final_navigation_not_redirect = false;
       break;
     }
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }