Make Wallet respect whether or not shipping address is required.

components/autofill/content/browser/wallet/wallet_client.cc

Index: components/autofill/content/browser/wallet/wallet_client.cc
diff --git a/components/autofill/content/browser/wallet/wallet_client.cc b/components/autofill/content/browser/wallet/wallet_client.cc
index aa82172b31f3ca649388b5c88db51d60aa917137..d403bacab0af8068c3cc9ae78affd3901e06aeda 100644
--- a/components/autofill/content/browser/wallet/wallet_client.cc
+++ b/components/autofill/content/browser/wallet/wallet_client.cc
@@ -231,6 +231,7 @@ const char kInstrumentExpYearKey[] = "instrument.credit_card.exp_year";
 const char kInstrumentType[] = "instrument.type";
 const char kInstrumentPhoneNumberKey[] = "instrument_phone_number";
 const char kMerchantDomainKey[] = "merchant_domain";
+const char kPhoneNumberRequired[] = "phone_number_required";
 const char kReasonKey[] = "reason";
 const char kRiskCapabilitiesKey[] = "supported_risk_challenge";
 const char kRiskParamsKey[] = "risk_params";
@@ -239,10 +240,12 @@ const char kSelectedInstrumentIdKey[] = "selected_instrument_id";
 const char kSessionMaterialKey[] = "session_material";
 const char kShippingAddressIdKey[] = "shipping_address_id";
 const char kShippingAddressKey[] = "shipping_address";
+const char kShippingAddressRequired[] = "shipping_address_required";
 const char kAutocheckoutStepsKey[] = "steps";
 const char kSuccessKey[] = "success";
 const char kUpgradedBillingAddressKey[] = "upgraded_billing_address";
 const char kUpgradedInstrumentIdKey[] = "upgraded_instrument_id";
+const char kUseMinimalAddresses[] = "use_minimal_addresses";
 
 }  // namespace
 
@@ -335,6 +338,9 @@ void WalletClient::GetFullWallet(const FullWalletRequest& full_wallet_request) {
   base::DictionaryValue request_dict;
   request_dict.SetString(kApiKeyKey, google_apis::GetAPIKey());
   request_dict.SetString(kRiskParamsKey, delegate_->GetRiskData());
+  request_dict.SetBoolean(kUseMinimalAddresses, false);
+  request_dict.SetBoolean(kPhoneNumberRequired, true);

[Dan Beam, 2013/07/26 17:54:31]

^ if we don't need to send these I'd rather not

[ahutter, 2013/07/26 18:21:28]

Currently we are relying on the server's default behavior for these. Seems
better to be explicit since this behavior is what chrome expects.

[Dan Beam, 2013/07/26 18:24:48]

OK, fair enough.

+
   request_dict.SetString(kSelectedInstrumentIdKey,
                          full_wallet_request.instrument_id);
   request_dict.SetString(kSelectedAddressIdKey, full_wallet_request.address_id);
@@ -394,6 +400,8 @@ void WalletClient::SaveToWallet(scoped_ptr<Instrument> instrument,
   request_dict.SetString(kRiskParamsKey, delegate_->GetRiskData());
   request_dict.SetString(kMerchantDomainKey,
                          source_url.GetWithEmptyPath().spec());
+  request_dict.SetBoolean(kUseMinimalAddresses, false);
+  request_dict.SetBoolean(kPhoneNumberRequired, true);
 
   std::string primary_account_number;
   std::string card_verification_number;
@@ -481,6 +489,10 @@ void WalletClient::GetWalletItems(const GURL& source_url) {
   request_dict.SetString(kApiKeyKey, google_apis::GetAPIKey());
   request_dict.SetString(kMerchantDomainKey,
                          source_url.GetWithEmptyPath().spec());
+  request_dict.SetBoolean(kShippingAddressRequired,
+                          delegate_->IsShippingAddressRequired());
+  request_dict.SetBoolean(kUseMinimalAddresses, false);
+  request_dict.SetBoolean(kPhoneNumberRequired, true);
 
   std::string post_body;
   base::JSONWriter::Write(&request_dict, &post_body);