Reland "Use upstream libaddressinput in Chrome."

third_party/libaddressinput/chromium/libaddressinput_util_unittest.cc

Index: third_party/libaddressinput/chromium/libaddressinput_util_unittest.cc
diff --git a/third_party/libaddressinput/chromium/addressinput_util_unittest.cc b/third_party/libaddressinput/chromium/libaddressinput_util_unittest.cc
similarity index 74%
copy from third_party/libaddressinput/chromium/addressinput_util_unittest.cc
copy to third_party/libaddressinput/chromium/libaddressinput_util_unittest.cc
index 846f3d4a33281538e8d8a3c134771e72e29cc718..23b0b938d43dc0108af4ef0b7817ecebd71309de 100644
--- a/third_party/libaddressinput/chromium/addressinput_util_unittest.cc
+++ b/third_party/libaddressinput/chromium/libaddressinput_util_unittest.cc
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/libaddressinput/chromium/addressinput_util.h"
+#include "third_party/libaddressinput/chromium/libaddressinput_util.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 
 namespace autofill {
 namespace addressinput {
 
 using ::i18n::addressinput::AddressData;
 
-TEST(AddressinputUtilTest, AddressRequiresRegionCode) {
+TEST(RequiredFieldsTest, AddressRequiresRegionCode) {
   AddressData address;
   EXPECT_FALSE(HasAllRequiredFields(address));
 }
 
-TEST(AddressinputUtilTest, UsRequiresState) {
+TEST(RequiredFieldsTest, UsRequiresState) {
   AddressData address;
   address.region_code = "US";
   address.postal_code = "90291";
@@ -27,7 +27,7 @@ TEST(AddressinputUtilTest, UsRequiresState) {
   EXPECT_FALSE(HasAllRequiredFields(address));
 }
 
-TEST(AddressinputUtilTest, CompleteAddressReturnsTrue) {
+TEST(RequiredFieldsTest, CompleteAddressReturnsTrue) {
   AddressData address;
   address.region_code = "US";
   address.postal_code = "90291";