Determine language code and type of format for address.

third_party/libaddressinput/chromium/cpp/test/address_data_test.cc

Index: third_party/libaddressinput/chromium/cpp/test/address_data_test.cc
diff --git a/third_party/libaddressinput/chromium/cpp/test/address_data_test.cc b/third_party/libaddressinput/chromium/cpp/test/address_data_test.cc
index a4d61c33afccbab30d865ef0839944f5faa2c97a..26659fa3ad1f4939ae80c9c8a00c46ec03dfe8ee 100644
--- a/third_party/libaddressinput/chromium/cpp/test/address_data_test.cc
+++ b/third_party/libaddressinput/chromium/cpp/test/address_data_test.cc
@@ -85,6 +85,7 @@ TEST(AddressDataTest, FormatForDisplayAr) {
 TEST(AddressDataTest, FormatForDisplayJp) {
   AddressData address;
   address.country_code = "JP";
+  address.language_code = "ja";
   address.administrative_area = "東京都";
   address.locality = "渋谷区";
   address.postal_code = "150-8512";
@@ -108,6 +109,33 @@ TEST(AddressDataTest, FormatForDisplayJp) {
   EXPECT_EQ(expected, actual);
 }
 
+TEST(AddressDataTest, FormatForDisplayJpLatn) {
+  AddressData address;
+  address.country_code = "JP";
+  address.language_code = "ja-latn";
+  address.administrative_area = "Tokyo";
+  address.locality = "Shibuya-ku";
+  address.postal_code = "150-8512";
+  address.address_lines.push_back("26-1 Sakuragaoka-cho");
+  address.address_lines.push_back("Cerulean Tower 6F");
+  address.organization = "Google Japan Inc.";
+  address.recipient = "Miki Murakami";
+
+  std::vector<std::string> actual;
+  address.FormatForDisplay(&actual);
+
+  std::vector<std::string> expected;
+  expected.push_back(address.recipient);
+  expected.push_back(address.organization);
+  expected.insert(expected.end(),
+                  address.address_lines.begin(),
+                  address.address_lines.end());
+  expected.push_back(address.locality + ", "+ address.administrative_area);
+  expected.push_back(address.postal_code);
+
+  EXPECT_EQ(expected, actual);
+}
+
 TEST(AddressDataTest, FormatForDisplayWithStreetCi) {
   AddressData address;
   address.country_code = "CI";