Updates to wallet for i18n

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

Index: components/autofill/content/browser/wallet/wallet_client_unittest.cc
diff --git a/components/autofill/content/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
index e55c01c9de553885d3ffd6dbb2ef554f565d52c5..0c25ce94b811ea1430c82b6b6ef685683a033cd2 100644
--- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
@@ -293,7 +293,8 @@ const char kErrorTypeMissingInResponse[] =
 
 // The JSON below is used to test against the request payload being sent to
 // Online Wallet. It's indented differently since JSONWriter creates compact
-// JSON from DictionaryValues.
+// JSON from DictionaryValues. NB: The values must be alphabetical to pass
+// the tests.

[Dan Beam, 2014/02/12 21:34:33]

^ that must've sucked to figure out, haha...

[Evan Stade, 2014/02/12 23:32:13]

overall updating the tests was rather droll but this part wasn't that hard to
figure out as the error output is pretty good (unlike the tests that say "128
byte object <asdf;jalkdfm;asdlmf> doesn't match 128 byte object
<asdfj;alsdfmkasdfasdf>)

 
 const char kAcceptLegalDocumentsValidRequest[] =
     "{"
@@ -394,9 +395,11 @@ const char kSaveAddressValidRequest[] =
                 "],"
                 "\"administrative_area_name\":\"save_admin_area_name\","
                 "\"country_name_code\":\"US\","
+                "\"dependent_locality_name\":\"save_dependent_locality_name\","
                 "\"locality_name\":\"save_locality_name\","
                 "\"postal_code_number\":\"save_postal_code_number\","
-                "\"recipient_name\":\"save_recipient_name\""
+                "\"recipient_name\":\"save_recipient_name\","
+                "\"sorting_code\":\"save_sorting_code\""
             "}"
         "},"
         "\"use_minimal_addresses\":false"
@@ -417,9 +420,11 @@ const char kSaveInstrumentValidRequest[] =
                     "],"
                     "\"administrative_area_name\":\"admin_area_name\","
                     "\"country_name_code\":\"US\","
+                    "\"dependent_locality_name\":\"dependent_locality_name\","
                     "\"locality_name\":\"locality_name\","
                     "\"postal_code_number\":\"postal_code_number\","
-                    "\"recipient_name\":\"recipient_name\""
+                    "\"recipient_name\":\"recipient_name\","
+                    "\"sorting_code\":\"sorting_code\""
                 "},"
                 "\"exp_month\":12,"
                 "\"exp_year\":3000,"
@@ -450,9 +455,11 @@ const char kSaveInstrumentAndAddressValidRequest[] =
                     "],"
                     "\"administrative_area_name\":\"admin_area_name\","
                     "\"country_name_code\":\"US\","
+                    "\"dependent_locality_name\":\"dependent_locality_name\","
                     "\"locality_name\":\"locality_name\","
                     "\"postal_code_number\":\"postal_code_number\","
-                    "\"recipient_name\":\"recipient_name\""
+                    "\"recipient_name\":\"recipient_name\","
+                    "\"sorting_code\":\"sorting_code\""
                 "},"
                 "\"exp_month\":12,"
                 "\"exp_year\":3000,"
@@ -477,9 +484,11 @@ const char kSaveInstrumentAndAddressValidRequest[] =
                 "],"
                 "\"administrative_area_name\":\"save_admin_area_name\","
                 "\"country_name_code\":\"US\","
+                "\"dependent_locality_name\":\"save_dependent_locality_name\","
                 "\"locality_name\":\"save_locality_name\","
                 "\"postal_code_number\":\"save_postal_code_number\","
-                "\"recipient_name\":\"save_recipient_name\""
+                "\"recipient_name\":\"save_recipient_name\","
+                "\"sorting_code\":\"save_sorting_code\""
             "}"
         "},"
         "\"use_minimal_addresses\":false"
@@ -503,9 +512,11 @@ const char kUpdateAddressValidRequest[] =
                 "],"
                 "\"administrative_area_name\":\"ship_admin_area_name\","
                 "\"country_name_code\":\"US\","
+                "\"dependent_locality_name\":\"ship_dependent_locality_name\","
                 "\"locality_name\":\"ship_locality_name\","
                 "\"postal_code_number\":\"ship_postal_code_number\","
-                "\"recipient_name\":\"ship_recipient_name\""
+                "\"recipient_name\":\"ship_recipient_name\","
+                "\"sorting_code\":\"ship_sorting_code\""
             "}"
         "},"
         "\"use_minimal_addresses\":false"
@@ -526,9 +537,11 @@ const char kUpdateInstrumentAddressValidRequest[] =
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
             "\"country_name_code\":\"US\","
+            "\"dependent_locality_name\":\"dependent_locality_name\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
-            "\"recipient_name\":\"recipient_name\""
+            "\"recipient_name\":\"recipient_name\","
+            "\"sorting_code\":\"sorting_code\""
         "},"
         "\"upgraded_instrument_id\":\"default_instrument_id\","
         "\"use_minimal_addresses\":false"
@@ -549,9 +562,11 @@ const char kUpdateInstrumentAddressWithNameChangeValidRequest[] =
             "],"
             "\"administrative_area_name\":\"admin_area_name\","
             "\"country_name_code\":\"US\","
+            "\"dependent_locality_name\":\"dependent_locality_name\","
             "\"locality_name\":\"locality_name\","
             "\"postal_code_number\":\"postal_code_number\","
-            "\"recipient_name\":\"recipient_name\""
+            "\"recipient_name\":\"recipient_name\","
+            "\"sorting_code\":\"sorting_code\""
         "},"
         "\"upgraded_instrument_id\":\"default_instrument_id\","
         "\"use_minimal_addresses\":false"