| Index: chrome/browser/ui/sync/profile_signin_confirmation_helper.cc
|
| diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc
|
| index 40cf7132b4f2356f6052f51b7119bc0d45f5ce10..c24e879bdb9ef8c5a089e24fc909079b3aef5774 100644
|
| --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc
|
| +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc
|
| @@ -92,7 +92,6 @@ class ProfileSigninConfirmationHelper
|
| Profile* profile_;
|
|
|
| // Used for async tasks.
|
| - CancelableRequestConsumer request_consumer_;
|
| base::CancelableTaskTracker task_tracker_;
|
|
|
| // Keep track of how many async requests are pending.
|
| @@ -162,7 +161,7 @@ void ProfileSigninConfirmationHelper::CheckHasTypedURLs() {
|
| base::Bind(
|
| &ProfileSigninConfirmationHelper::ReturnResult,
|
| this)),
|
| - &request_consumer_);
|
| + &task_tracker_);
|
| }
|
|
|
| void ProfileSigninConfirmationHelper::set_pending_requests(int requests) {
|
| @@ -174,7 +173,7 @@ void ProfileSigninConfirmationHelper::ReturnResult(bool result) {
|
| // 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);
|
| }
|
| }
|
|
|