Port HistoryService::ScheduleDBTask to CancelableTaskTracker

chrome/browser/ui/sync/profile_signin_confirmation_helper.cc

 // Copyright 2013 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/ui/sync/profile_signin_confirmation_helper.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ skipping 74 matching lines @@
   ~ProfileSigninConfirmationHelper();
 
   void OnHistoryQueryResults(size_t max_entries,
                              history::QueryResults* results);
   void ReturnResult(bool result);
 
   // Weak pointer to the profile being signed-in.
   Profile* profile_;
 
   // Used for async tasks.
-  CancelableRequestConsumer request_consumer_;
   base::CancelableTaskTracker task_tracker_;
 
   // Keep track of how many async requests are pending.
   int pending_requests_;
 
   // Indicates whether the result has already been returned to caller.
   bool result_returned_;
 
   // Callback to pass the result back to the caller.
   const base::Callback<void(bool)> return_result_;
@@ skipping 49 matching lines @@
       HistoryServiceFactory::GetForProfileWithoutCreating(profile_);
   if (!service) {
     ReturnResult(false);
     return;
   }
   service->ScheduleDBTask(
       new HasTypedURLsTask(
           base::Bind(
               &ProfileSigninConfirmationHelper::ReturnResult,
               this)),
-      &request_consumer_);
+      &task_tracker_);
 }
 
 void ProfileSigninConfirmationHelper::set_pending_requests(int requests) {
   pending_requests_ = requests;
 }
 
 void ProfileSigninConfirmationHelper::ReturnResult(bool result) {
   // Pass |true| into the callback as soon as one of the tasks passes a
   // result of |true|, otherwise pass the last returned result.
   if (!result_returned_ && (--pending_requests_ == 0 || result)) {
     result_returned_ = true;
-    request_consumer_.CancelAllRequests();
+    task_tracker_.TryCancelAll();
     return_result_.Run(result);
   }
 }
 
 }  // namespace
 
 namespace ui {
 
 SkColor GetSigninConfirmationPromptBarColor(SkAlpha alpha) {
   static const SkColor kBackgroundColor =
@@ skipping 44 matching lines @@
   // Fire asynchronous queries for profile data.
   scoped_refptr<ProfileSigninConfirmationHelper> helper =
       new ProfileSigninConfirmationHelper(profile, return_result);
   const int requests = 2;
   helper->set_pending_requests(requests);
   helper->CheckHasHistory(kHistoryEntriesBeforeNewProfilePrompt);
   helper->CheckHasTypedURLs();
 }
 
 }  // namespace ui