WalletClient: don't bother queuing requests; we don't make multiple requests concurrently anyway

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 858 matching lines @@
     return section == SECTION_CC_BILLING || section == SECTION_SHIPPING;
 
   return section != SECTION_CC_BILLING;
 }
 
 void AutofillDialogControllerImpl::GetWalletItems() {
   ScopedViewUpdates updates(view_.get());
 
   wallet_items_requested_ = true;
   wallet::WalletClient* wallet_client = GetWalletClient();
-  wallet_client->CancelRequests();
+  wallet_client->CancelRequest();
 
   previously_selected_instrument_id_.clear();
   previously_selected_shipping_address_id_.clear();
   if (wallet_items_) {
     previous_default_instrument_id_ = wallet_items_->default_instrument_id();
     previous_default_shipping_address_id_ = wallet_items_->default_address_id();
 
     const wallet::WalletItems::MaskedInstrument* instrument =
         ActiveInstrument();
     if (instrument)
@@ skipping 1525 matching lines @@
 
 void AutofillDialogControllerImpl::AccountChooserWillShow() {
   HidePopup();
 }
 
 void AutofillDialogControllerImpl::AccountChoiceChanged() {
   ScopedViewUpdates updates(view_.get());
   wallet::WalletClient* client = GetWalletClient();
 
   if (is_submitting_)
-    client->CancelRequests();
+    client->CancelRequest();
 
   SetIsSubmitting(false);
 
   size_t selected_user_index =
       account_chooser_model_->GetActiveWalletAccountIndex();
   if (account_chooser_model_->WalletIsSelected() &&
       client->user_index() != selected_user_index) {
     client->SetUserIndex(selected_user_index);
     // Clear |wallet_items_| so we don't try to restore the selected instrument
     // and address.
@@ skipping 183 matching lines @@
 
 bool AutofillDialogControllerImpl::IsManuallyEditingSection(
     DialogSection section) const {
   return IsEditingExistingData(section) ||
          SuggestionsMenuModelForSection(section)->
              GetItemKeyForCheckedItem() == kAddNewItemKey;
 }
 
 void AutofillDialogControllerImpl::OnWalletSigninError() {
   account_chooser_model_->SetHadWalletSigninError();
-  GetWalletClient()->CancelRequests();
+  GetWalletClient()->CancelRequest();
   LogDialogLatencyToShow();
 }
 
 void AutofillDialogControllerImpl::DisableWallet(
     wallet::WalletClient::ErrorType error_type) {
   signin_helper_.reset();
   wallet_items_.reset();
   wallet_errors_.clear();
-  GetWalletClient()->CancelRequests();
+  GetWalletClient()->CancelRequest();
   SetIsSubmitting(false);
   wallet_error_notification_ = GetWalletError(error_type);
   account_chooser_model_->SetHadWalletError();
 }
 
 void AutofillDialogControllerImpl::SuggestionsUpdated() {
   ScopedViewUpdates updates(view_.get());
 
   const FieldValueMap snapshot = TakeUserInputSnapshot();
 
@@ skipping 889 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill