Updates to wallet for i18n

components/autofill/content/browser/wallet/wallet_test_util.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 "components/autofill/content/browser/wallet/wallet_test_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
@@ skipping 56 matching lines @@
       WalletItems::MaskedInstrument::VALID);
 }
 
 scoped_ptr<GaiaAccount> GetTestGaiaAccount() {
   return GaiaAccount::CreateForTesting("user@chromium.org",
                                        "obfuscated_id",
                                        0,
                                        true);
 }
 
+std::vector<base::string16> StreetAddress(const std::string& line1,
+                                          const std::string& line2) {
+  std::vector<base::string16> street_address;
+  street_address.push_back(ASCIIToUTF16(line1));
+  street_address.push_back(ASCIIToUTF16(line2));
+  return street_address;
+}
+
 scoped_ptr<Address> GetTestAddress() {
-  return make_scoped_ptr(new Address("US",
-                                     ASCIIToUTF16("recipient_name"),
-                                     ASCIIToUTF16("address_line_1"),
-                                     ASCIIToUTF16("address_line_2"),
-                                     ASCIIToUTF16("locality_name"),
-                                     ASCIIToUTF16("admin_area_name"),
-                                     ASCIIToUTF16("postal_code_number"),
-                                     ASCIIToUTF16("phone_number"),
-                                     std::string()));
+  return make_scoped_ptr(
+      new Address("US",
+                  ASCIIToUTF16("recipient_name"),
+                  StreetAddress("address_line_1", "address_line_2"),
+                  ASCIIToUTF16("locality_name"),
+                  ASCIIToUTF16("dependent_locality_name"),
+                  ASCIIToUTF16("admin_area_name"),
+                  ASCIIToUTF16("postal_code_number"),
+                  ASCIIToUTF16("sorting_code"),
+                  ASCIIToUTF16("phone_number"),
+                  std::string()));
 }
 
 scoped_ptr<Address> GetTestMinimalAddress() {
   scoped_ptr<Address> address = GetTestAddress();
   address->set_is_complete_address(false);
   return address.Pass();
 }
 
 scoped_ptr<FullWallet> GetTestFullWallet() {
   return GetTestFullWalletWithRequiredActions(std::vector<RequiredAction>());
@@ skipping 100 matching lines @@
       amex_permission == AMEX_ALLOWED ?
           WalletItems::MaskedInstrument::VALID :
           WalletItems::MaskedInstrument::AMEX_NOT_SUPPORTED);
 }
 
 scoped_ptr<WalletItems::MaskedInstrument> GetTestNonDefaultMaskedInstrument() {
   return GetTestMaskedInstrumentWithId("instrument_id");
 }
 
 scoped_ptr<Address> GetTestSaveableAddress() {
-  return make_scoped_ptr(new Address("US",
-                                     ASCIIToUTF16("save_recipient_name"),
-                                     ASCIIToUTF16("save_address_line_1"),
-                                     ASCIIToUTF16("save_address_line_2"),
-                                     ASCIIToUTF16("save_locality_name"),
-                                     ASCIIToUTF16("save_admin_area_name"),
-                                     ASCIIToUTF16("save_postal_code_number"),
-                                     ASCIIToUTF16("save_phone_number"),
-                                     std::string()));
+  return make_scoped_ptr(
+      new Address("US",
+                  ASCIIToUTF16("save_recipient_name"),
+                  StreetAddress("save_address_line_1", "save_address_line_2"),
+                  ASCIIToUTF16("save_locality_name"),
+                  ASCIIToUTF16("save_dependent_locality_name"),
+                  ASCIIToUTF16("save_admin_area_name"),
+                  ASCIIToUTF16("save_postal_code_number"),
+                  ASCIIToUTF16("save_sorting_code"),
+                  ASCIIToUTF16("save_phone_number"),
+                  std::string()));
 }
 
 scoped_ptr<Address> GetTestShippingAddress() {
-  return make_scoped_ptr(new Address("US",
-                                     ASCIIToUTF16("ship_recipient_name"),
-                                     ASCIIToUTF16("ship_address_line_1"),
-                                     ASCIIToUTF16("ship_address_line_2"),
-                                     ASCIIToUTF16("ship_locality_name"),
-                                     ASCIIToUTF16("ship_admin_area_name"),
-                                     ASCIIToUTF16("ship_postal_code_number"),
-                                     ASCIIToUTF16("ship_phone_number"),
-                                     "default_address_id"));
+  return make_scoped_ptr(
+      new Address("US",
+                  ASCIIToUTF16("ship_recipient_name"),
+                  StreetAddress("ship_address_line_1", "ship_address_line_2"),
+                  ASCIIToUTF16("ship_locality_name"),
+                  ASCIIToUTF16("ship_dependent_locality_name"),
+                  ASCIIToUTF16("ship_admin_area_name"),
+                  ASCIIToUTF16("ship_postal_code_number"),
+                  ASCIIToUTF16("ship_sorting_code"),
+                  ASCIIToUTF16("ship_phone_number"),
+                  "default_address_id"));
 }
 
 scoped_ptr<Address> GetTestNonDefaultShippingAddress() {
   scoped_ptr<Address> address = GetTestShippingAddress();
   address->set_object_id("address_id");
   return address.Pass();
 }
 
 scoped_ptr<WalletItems> GetTestWalletItemsWithDetails(
     const std::vector<RequiredAction>& required_actions,
@@ skipping 51 matching lines @@
       GetTestWalletItemsWithDetails(std::vector<RequiredAction>(),
                                     default_instrument_id,
                                     default_address_id,
                                     amex_permission);
   items->AddAccount(GetTestGaiaAccount());
   return items.Pass();
 }
 
 }  // namespace wallet
 }  // namespace autofill