Make Wallet respect whether or not shipping address is required.

components/autofill/content/browser/wallet/wallet_client_unittest.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 "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 299 matching lines @@
     "{"
         "\"instrument_id\":\"instrument_id\","
         "\"risk_params\":\"risky business\""
     "}";
 
 const char kGetFullWalletValidRequest[] =
     "{"
         "\"feature\":\"REQUEST_AUTOCOMPLETE\","
         "\"google_transaction_id\":\"google_transaction_id\","
         "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"selected_address_id\":\"shipping_address_id\","
         "\"selected_instrument_id\":\"instrument_id\","
         "\"supported_risk_challenge\":"
         "["
-        "]"
+        "],"
+        "\"use_minimal_addresses\":false"
     "}";
 
 const char kGetFullWalletWithRiskCapabilitesValidRequest[] =
     "{"
         "\"feature\":\"REQUEST_AUTOCOMPLETE\","
         "\"google_transaction_id\":\"google_transaction_id\","
         "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"selected_address_id\":\"shipping_address_id\","
         "\"selected_instrument_id\":\"instrument_id\","
         "\"supported_risk_challenge\":"
         "["
             "\"VERIFY_CVC\""
-        "]"
+        "],"
+        "\"use_minimal_addresses\":false"
     "}";
 
 const char kGetWalletItemsValidRequest[] =
     "{"
-        "\"merchant_domain\":\"https://example.com/\""
+        "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
+        "\"shipping_address_required\":true,"
+        "\"use_minimal_addresses\":false"
     "}";
 
 const char kSaveAddressValidRequest[] =
     "{"
         "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"shipping_address\":"
         "{"
             "\"phone_number\":\"save_phone_number\","
             "\"postal_address\":"
             "{"
                 "\"address_line\":"
                 "["
                     "\"save_address_line_1\","
                     "\"save_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"save_admin_area_name\","
                 "\"country_name_code\":\"US\","
                 "\"locality_name\":\"save_locality_name\","
                 "\"postal_code_number\":\"save_postal_code_number\","
                 "\"recipient_name\":\"save_recipient_name\""
             "}"
-        "}"
+        "},"
+        "\"use_minimal_addresses\":false"
     "}";
 
 const char kSaveInstrumentValidRequest[] =
     "{"
         "\"instrument\":"
         "{"
             "\"credit_card\":"
             "{"
                 "\"address\":"
                 "{"
@@ skipping 10 matching lines @@
                 "},"
                 "\"exp_month\":12,"
                 "\"exp_year\":3000,"
                 "\"fop_type\":\"VISA\","
                 "\"last_4_digits\":\"4448\""
             "},"
             "\"type\":\"CREDIT_CARD\""
         "},"
         "\"instrument_phone_number\":\"phone_number\","
         "\"merchant_domain\":\"https://example.com/\","
-        "\"risk_params\":\"risky business\""
+        "\"phone_number_required\":true,"
+        "\"risk_params\":\"risky business\","
+        "\"use_minimal_addresses\":false"
       "}";
 
 const char kSaveInstrumentAndAddressValidRequest[] =
     "{"
         "\"instrument\":"
         "{"
             "\"credit_card\":"
             "{"
                 "\"address\":"
                 "{"
@@ skipping 10 matching lines @@
                 "},"
                 "\"exp_month\":12,"
                 "\"exp_year\":3000,"
                 "\"fop_type\":\"VISA\","
                 "\"last_4_digits\":\"4448\""
             "},"
             "\"type\":\"CREDIT_CARD\""
         "},"
         "\"instrument_phone_number\":\"phone_number\","
         "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"shipping_address\":"
         "{"
             "\"phone_number\":\"save_phone_number\","
             "\"postal_address\":"
             "{"
                 "\"address_line\":"
                 "["
                     "\"save_address_line_1\","
                     "\"save_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"save_admin_area_name\","
                 "\"country_name_code\":\"US\","
                 "\"locality_name\":\"save_locality_name\","
                 "\"postal_code_number\":\"save_postal_code_number\","
                 "\"recipient_name\":\"save_recipient_name\""
             "}"
-        "}"
+        "},"
+        "\"use_minimal_addresses\":false"
     "}";
 
 const char kSendAutocheckoutStatusOfSuccessValidRequest[] =
     "{"
         "\"google_transaction_id\":\"google_transaction_id\","
         "\"merchant_domain\":\"https://example.com/\","
         "\"success\":true"
     "}";
 
 const char kSendAutocheckoutStatusWithStatisticsValidRequest[] =
     "{"
         "\"google_transaction_id\":\"google_transaction_id\","
         "\"merchant_domain\":\"https://example.com/\","
         "\"steps\":[{\"step_description\":\"1_AUTOCHECKOUT_STEP_SHIPPING\""
         ",\"time_taken\":100}],"
         "\"success\":true"
     "}";
 
 const char kSendAutocheckoutStatusOfFailureValidRequest[] =
     "{"
         "\"google_transaction_id\":\"google_transaction_id\","
         "\"merchant_domain\":\"https://example.com/\","
         "\"reason\":\"CANNOT_PROCEED\","
         "\"success\":false"
     "}";
 
 const char kUpdateAddressValidRequest[] =
     "{"
         "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"shipping_address\":"
         "{"
             "\"id\":\"shipping_address_id\","
             "\"phone_number\":\"ship_phone_number\","
             "\"postal_address\":"
             "{"
                 "\"address_line\":"
                 "["
                     "\"ship_address_line_1\","
                     "\"ship_address_line_2\""
                 "],"
                 "\"administrative_area_name\":\"ship_admin_area_name\","
                 "\"country_name_code\":\"US\","
                 "\"locality_name\":\"ship_locality_name\","
                 "\"postal_code_number\":\"ship_postal_code_number\","
                 "\"recipient_name\":\"ship_recipient_name\""
             "}"
-        "}"
+        "},"
+        "\"use_minimal_addresses\":false"
     "}";
 
 const char kUpdateInstrumentAddressValidRequest[] =
     "{"
         "\"instrument_phone_number\":\"phone_number\","
         "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"upgraded_billing_address\":"
         "{"
             "\"address_line\":"
             "["
                 "\"address_line_1\","
                 "\"address_line_2\""
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
             "\"country_name_code\":\"US\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
             "\"recipient_name\":\"recipient_name\""
         "},"
-        "\"upgraded_instrument_id\":\"instrument_id\""
+        "\"upgraded_instrument_id\":\"instrument_id\","
+        "\"use_minimal_addresses\":false"
     "}";
 
 const char kUpdateInstrumentAddressWithNameChangeValidRequest[] =
     "{"
         "\"instrument_phone_number\":\"phone_number\","
         "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
         "\"upgraded_billing_address\":"
         "{"
             "\"address_line\":"
             "["
                 "\"address_line_1\","
                 "\"address_line_2\""
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
             "\"country_name_code\":\"US\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
             "\"recipient_name\":\"recipient_name\""
         "},"
-        "\"upgraded_instrument_id\":\"instrument_id\""
+        "\"upgraded_instrument_id\":\"instrument_id\","
+        "\"use_minimal_addresses\":false"
     "}";
 
 const char kUpdateInstrumentExpirationDateValidRequest[] =
     "{"
         "\"instrument\":"
         "{"
             "\"credit_card\":"
             "{"
                 "\"exp_month\":12,"
                 "\"exp_year\":3000"
             "},"
             "\"type\":\"CREDIT_CARD\""
         "},"
         "\"merchant_domain\":\"https://example.com/\","
+        "\"phone_number_required\":true,"
         "\"risk_params\":\"risky business\","
-        "\"upgraded_instrument_id\":\"instrument_id\""
+        "\"upgraded_instrument_id\":\"instrument_id\","
+        "\"use_minimal_addresses\":false"
     "}";
 
 class MockAutofillMetrics : public AutofillMetrics {
  public:
   MockAutofillMetrics() {}
   MOCK_CONST_METHOD2(LogWalletApiCallDuration,
                      void(WalletApiCallMetric metric,
                           const base::TimeDelta& duration));
   MOCK_CONST_METHOD2(LogWalletErrorMetric,
                      void(DialogType dialog_type, WalletErrorMetric metric));
@@ skipping 19 matching lines @@
   }
 
   virtual std::string GetRiskData() const OVERRIDE {
     return "risky business";
   }
 
   virtual std::string GetWalletCookieValue() const OVERRIDE {
     return "gdToken";
   }
 
+  virtual bool IsShippingAddressRequired() const OVERRIDE {
+    return true;

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

^ I don't see a test that verifies the delegate is obeyed, but ok

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

Done.

+  }
+
   void ExpectLogWalletApiCallDuration(
       AutofillMetrics::WalletApiCallMetric metric,
       size_t times) {
     EXPECT_CALL(metric_logger_,
                 LogWalletApiCallDuration(metric, testing::_)).Times(times);
   }
 
   void ExpectWalletErrorMetric(AutofillMetrics::WalletErrorMetric metric) {
     EXPECT_CALL(
         metric_logger_,
@@ skipping 967 matching lines @@
   wallet_client_->GetWalletItems(GURL(kMerchantUrl));
   EXPECT_EQ(2U, wallet_client_->pending_requests_.size());
 
   wallet_client_->CancelRequests();
   EXPECT_EQ(0U, wallet_client_->pending_requests_.size());
   EXPECT_FALSE(wallet_client_->HasRequestInProgress());
 }
 
 }  // namespace wallet
 }  // namespace autofill