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

chrome/browser/history/history_backend.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/history/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 1256 matching lines @@
        it != matching_visits.end() && result->size() < max_results; ++it) {
     result->AppendURLBySwapping(&(*it));
   }
 
   if (matching_visits.size() == result->size() &&
       options.begin_time <= first_recorded_time_)
     result->set_reached_beginning(true);
 }
 
 // Frontend to GetMostRecentRedirectsFrom from the history thread.
-void HistoryBackend::QueryRedirectsFrom(
-    scoped_refptr<QueryRedirectsRequest> request,
-    const GURL& url) {
-  if (request->canceled())
-    return;
-  bool success = GetMostRecentRedirectsFrom(url, &request->value);
-  request->ForwardResult(request->handle(), url, success, &request->value);
+void HistoryBackend::QueryRedirectsFrom(const GURL& url,
+                                        QueryRedirectsResult* result) {
+  result->success = GetMostRecentRedirectsFrom(url, &result->redirects);

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

codesearch seems partially broken so this may be wrong, but 
GetMostRecentRedirectsFrom() seems to be only called from here, maybe it would
make sense to actually inline it here?

Same for GetMostRecentRedirectsTo()

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

It's called multiple times from this file (at least three times), so I won't
inline it. GetMostRecentRedirectsTo is only called once, but there is a second
call that is commented and marked with a bug number to re-enable, so I'll also
leave the function untouched.

 }
 
-void HistoryBackend::QueryRedirectsTo(
-    scoped_refptr<QueryRedirectsRequest> request,
-    const GURL& url) {
-  if (request->canceled())
-    return;
-  bool success = GetMostRecentRedirectsTo(url, &request->value);
-  request->ForwardResult(request->handle(), url, success, &request->value);
+void HistoryBackend::QueryRedirectsTo(const GURL& url,
+                                      QueryRedirectsResult* result) {
+  result->success = GetMostRecentRedirectsTo(url, &result->redirects);
 }
 
 void HistoryBackend::GetVisibleVisitCountToHost(
     scoped_refptr<GetVisibleVisitCountToHostRequest> request,
     const GURL& url) {
   if (request->canceled())
     return;
   int count = 0;
   Time first_visit;
   const bool success = db_.get() &&
@@ skipping 1514 matching lines @@
   int rank = kPageVisitStatsMaxTopSites;
   std::map<GURL, int>::const_iterator it = most_visited_urls_map_.find(url);
   if (it != most_visited_urls_map_.end())
     rank = (*it).second;
   UMA_HISTOGRAM_ENUMERATION("History.TopSitesVisitsByRank",
                             rank, kPageVisitStatsMaxTopSites + 1);
 }
 #endif
 
 }  // namespace history