Make Wallet respect whether or not shipping address is required.

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 1349 matching lines @@
       static_cast<size_t>(index) >= wallet_items_->instruments().size()) {
     NOTREACHED();
     return NULL;
   }
 
   return wallet_items_->instruments()[index];
 }
 
 const wallet::Address* AutofillDialogControllerImpl::
     ActiveShippingAddress() const {
-  if (!IsPayingWithWallet())
+  if (!IsPayingWithWallet() || !IsShippingAddressRequired())
     return NULL;
 
   const SuggestionsMenuModel* model =
       SuggestionsMenuModelForSection(SECTION_SHIPPING);
   const std::string item_key = model->GetItemKeyForCheckedItem();
   if (!IsASuggestionItemKey(item_key))
     return NULL;
 
   int index;
   if (!base::StringToInt(item_key, &index) || index < 0 ||
@@ skipping 742 matching lines @@
 
 std::string AutofillDialogControllerImpl::GetRiskData() const {
   DCHECK(!risk_data_.empty());
   return risk_data_;
 }
 
 std::string AutofillDialogControllerImpl::GetWalletCookieValue() const {
   return wallet_cookie_value_;
 }
 
+bool AutofillDialogControllerImpl::IsShippingAddressRequired() const {
+  return cares_about_shipping_;
+}
+
 void AutofillDialogControllerImpl::OnDidAcceptLegalDocuments() {
   DCHECK(is_submitting_ && IsPayingWithWallet());
   has_accepted_legal_documents_ = true;
   LoadRiskFingerprintData();
 }
 
 void AutofillDialogControllerImpl::OnDidAuthenticateInstrument(bool success) {
   DCHECK(is_submitting_ && IsPayingWithWallet());
 
   // TODO(dbeam): use the returned full wallet. b/8332329
@@ skipping 592 matching lines @@
 
 void AutofillDialogControllerImpl::FillOutputForSection(DialogSection section) {
   FillOutputForSectionWithComparator(
       section, base::Bind(DetailInputMatchesField, section));
 }
 
 bool AutofillDialogControllerImpl::FormStructureCaresAboutSection(
     DialogSection section) const {
   // For now, only SECTION_SHIPPING may be omitted due to a site not asking for
   // any of the fields.
-  // TODO(estade): remove !IsPayingWithWallet() check once WalletClient support
-  // is added. http://crbug.com/243514
-  if (section == SECTION_SHIPPING && !IsPayingWithWallet())
+  if (section == SECTION_SHIPPING)
     return cares_about_shipping_;
 
   return true;
 }
 
 void AutofillDialogControllerImpl::SetCvcResult(const string16& cvc) {
   for (size_t i = 0; i < form_structure_.field_count(); ++i) {
     AutofillField* field = form_structure_.field(i);
     if (field->type() == CREDIT_CARD_VERIFICATION_CODE) {
       field->value = cvc;
@@ skipping 249 matching lines @@
 
   const wallet::WalletItems::MaskedInstrument* active_instrument =
       ActiveInstrument();
   if (!IsManuallyEditingSection(SECTION_CC_BILLING)) {
     active_instrument_id_ = active_instrument->object_id();
     DCHECK(!active_instrument_id_.empty());
   }
 
   const wallet::Address* active_address = ActiveShippingAddress();
   if (!IsManuallyEditingSection(SECTION_SHIPPING) &&
-      !ShouldUseBillingForShipping()) {
+      !ShouldUseBillingForShipping() &&
+      IsShippingAddressRequired()) {
     active_address_id_ = active_address->object_id();
     DCHECK(!active_address_id_.empty());
   }
 
   if (GetDialogType() == DIALOG_TYPE_AUTOCHECKOUT) {
     DCHECK_EQ(AUTOCHECKOUT_NOT_STARTED, autocheckout_state_);
     SetAutocheckoutState(AUTOCHECKOUT_IN_PROGRESS);
   }
 
   scoped_ptr<wallet::Instrument> inputted_instrument =
       CreateTransientInstrument();
   if (inputted_instrument && IsEditingExistingData(SECTION_CC_BILLING)) {
     inputted_instrument->set_object_id(active_instrument->object_id());
     DCHECK(!inputted_instrument->object_id().empty());
   }
 
   scoped_ptr<wallet::Address> inputted_address;
-  if (active_address_id_.empty()) {
+  if (active_address_id_.empty() && IsShippingAddressRequired()) {
     if (ShouldUseBillingForShipping()) {
       const wallet::Address& address = inputted_instrument ?
           *inputted_instrument->address() : active_instrument->address();
       // Try to find an exact matched shipping address and use it for shipping,
       // otherwise save it as a new shipping address. http://crbug.com/225442
       const wallet::Address* duplicated_address =
           FindDuplicateAddress(wallet_items_->addresses(), address);
       if (duplicated_address) {
         active_address_id_ = duplicated_address->object_id();
         DCHECK(!active_address_id_.empty());
       } else {
         inputted_address.reset(new wallet::Address(address));
         DCHECK(inputted_address->object_id().empty());
       }
     } else {
       inputted_address = CreateTransientAddress();
       if (IsEditingExistingData(SECTION_SHIPPING)) {
         inputted_address->set_object_id(active_address->object_id());
         DCHECK(!inputted_address->object_id().empty());
       }
     }
   }
 
   // If there's neither an address nor instrument to save, |GetFullWallet()|
   // is called when the risk fingerprint is loaded.
-  if (!active_instrument_id_.empty() && !active_address_id_.empty()) {
+  if (!active_instrument_id_.empty() &&
+      (!active_address_id_.empty() || !IsShippingAddressRequired())) {
     GetFullWallet();
     return;
   }
 
   GetWalletClient()->SaveToWallet(inputted_instrument.Pass(),
                                   inputted_address.Pass(),
                                   source_url_);
 }
 
 scoped_ptr<wallet::Instrument> AutofillDialogControllerImpl::
@@ skipping 23 matching lines @@
   FillFormGroupFromOutputs(output, &profile);
 
   return scoped_ptr<wallet::Address>(new wallet::Address(profile));
 }
 
 void AutofillDialogControllerImpl::GetFullWallet() {
   DCHECK(is_submitting_);
   DCHECK(IsPayingWithWallet());
   DCHECK(wallet_items_);
   DCHECK(!active_instrument_id_.empty());
-  DCHECK(!active_address_id_.empty());
+  DCHECK(!active_address_id_.empty() || !IsShippingAddressRequired());
 
   std::vector<wallet::WalletClient::RiskCapability> capabilities;
   capabilities.push_back(wallet::WalletClient::VERIFY_CVC);
 
   UpdateAutocheckoutStep(AUTOCHECKOUT_STEP_PROXY_CARD,
                          AUTOCHECKOUT_STEP_STARTED);
 
   GetWalletClient()->GetFullWallet(wallet::WalletClient::FullWalletRequest(
       active_instrument_id_,
       active_address_id_,
@@ skipping 315 matching lines @@
     view_->GetUserInput(SECTION_CC_BILLING, &output);
     CreditCard card;
     GetBillingInfoFromOutputs(output, &card, NULL, NULL);
     backing_last_four = card.TypeAndLastFourDigits();
   }
   AutofillCreditCardBubbleController::ShowGeneratedCardBubble(
       web_contents(), backing_last_four, full_wallet_->TypeAndLastFourDigits());
 }
 
 }  // namespace autofill