Update libaddressinput's US address format

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

 // Copyright (C) 2014 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 12 matching lines @@
 
 using i18n::addressinput::AddressData;
 
 TEST(AddressDataTest, FormatForDisplayEmpty) {
   AddressData address;
   std::vector<std::string> actual;
   address.FormatForDisplay(&actual);
   EXPECT_EQ(std::vector<std::string>(), actual);
 }
 
+TEST(AddressDataTest, FormatForDisplayUs) {
+  AddressData address;
+  address.country_code = "US";
+  address.administrative_area = "Texas";
+  address.locality = "Houston";
+  address.postal_code = "77005";
+  address.address_lines.push_back("123 Main St");
+  address.address_lines.push_back("Apt 2");
+  address.organization = "ACME Corp.";
+  address.recipient = "John Doe";
+
+  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 +
+                     " " + address.postal_code);
+
+  EXPECT_EQ(expected, actual);
+}
+
 TEST(AddressDataTest, FormatForDisplayAr) {
   AddressData address;
   address.country_code = "AR";
   address.administrative_area = "Capital Federal";
   address.locality = "Buenos Aires";
   address.postal_code = "C1001AFB";
   address.address_lines.push_back("Su Calle 123");
   address.address_lines.push_back("5° Piso");
   address.organization = "Empresa Ejemplo";
   address.recipient = "Juan Perez";
@@ skipping 71 matching lines @@
   std::vector<std::string> expected(
       1,
       address.sorting_code + "  " +
           address.locality + " " +
           address.sorting_code);
 
   EXPECT_EQ(expected, actual);
 }
 
 }  // namespace