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

chrome/browser/history/history_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "chrome/browser/common/cancelable_request.h"

[droger, 2014/06/23 16:50:35]

Is this still needed?

[sdefresne, 2014/06/24 13:41:00]

Yes, there are still many usage of CancelableRequestProvider/Consumer in the
file. I'm porting them one at a time.

 #include "chrome/browser/history/delete_directive_handler.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/typed_url_syncable_service.h"
 #include "chrome/common/ref_counted_util.h"
 #include "components/favicon_base/favicon_callback.h"
 #include "components/history/core/browser/history_client.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/search_engines/template_url_id.h"
 #include "components/visitedlink/browser/visitedlink_delegate.h"
 #include "content/public/browser/download_manager_delegate.h"
@@ skipping 231 matching lines @@
   // the original page. If A redirects to B which redirects to C, the vector
   // will contain [B, C], and A will be in 'from_url'.
   //
   // For QueryRedirectsTo, the order is reversed. For A->B->C, the vector will
   // contain [B, A] and C will be in 'to_url'.
   //
   // If there is no such URL in the database or the most recent visit has no
   // redirect, the vector will be empty. If the history system failed for
   // some reason, success will additionally be false. If the given page
   // has redirected to multiple destinations, this will pick a random one.
-  typedef base::Callback<void(Handle,
-                              GURL,  // from_url / to_url
+  typedef base::Callback<void(GURL,  // from_url / to_url
                               bool,  // success
-                              history::RedirectList*)> QueryRedirectsCallback;
+                              const history::RedirectList*)>
+      QueryRedirectsCallback;
 
   // Schedules a query for the most recent redirect coming out of the given
   // URL. See the RedirectQuerySource above, which is guaranteed to be called
   // if the request is not canceled.
-  Handle QueryRedirectsFrom(const GURL& from_url,
-                            CancelableRequestConsumerBase* consumer,
-                            const QueryRedirectsCallback& callback);
+  base::CancelableTaskTracker::TaskId QueryRedirectsFrom(
+      const GURL& from_url,
+      const QueryRedirectsCallback& callback,
+      base::CancelableTaskTracker* tracker);
 
   // Schedules a query to get the most recent redirects ending at the given
   // URL.
-  Handle QueryRedirectsTo(const GURL& to_url,
-                          CancelableRequestConsumerBase* consumer,
-                          const QueryRedirectsCallback& callback);
+  base::CancelableTaskTracker::TaskId QueryRedirectsTo(
+      const GURL& to_url,
+      const QueryRedirectsCallback& callback,
+      base::CancelableTaskTracker* tracker);
 
   typedef base::Callback<
       void(Handle,
            bool,        // Were we able to determine the # of visits?
            int,         // Number of visits.
            base::Time)> // Time of first visit. Only set if bool
                         // is true and int is > 0.
       GetVisibleVisitCountToHostCallback;
 
   // Requests the number of user-visible visits (i.e. no redirects or subframes)
@@ skipping 731 matching lines @@
   scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
 
   ObserverList<history::VisitDatabaseObserver> visit_database_observers_;
 
   history::DeleteDirectiveHandler delete_directive_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_