Autofill i18n: Set postal code and state field labels based on the selected country.

chrome/browser/autofill/autofill_manager_unittest.cc

Index: chrome/browser/autofill/autofill_manager_unittest.cc
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index e6c254813035d149ed40bbb498785438756a0b08..ad2f7a818bd63b34e37116db9703c86d5c36556e 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -376,7 +376,7 @@ void ExpectFilledAddressFormElvis(int page_id,
                                   bool has_credit_card_fields) {
   ExpectFilledForm(page_id, filled_form, expected_page_id, "Elvis", "Aaron",
                    "Presley", "3734 Elvis Presley Blvd.", "Apt. 10", "Memphis",
-                   "Tennessee", "38116", "USA", "12345678901", "",
+                   "Tennessee", "38116", "United States", "12345678901", "",
                    "theking@gmail.com", "", "", "", "", true,
                    has_credit_card_fields, false);
 }