Reland "Use upstream libaddressinput in Chrome."

chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 
 #include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
 
 namespace autofill {
 namespace i18ninput {
 
 namespace {
 
 const size_t kNumberOfAddressLinesUS = 6;
 
 }  // namespace
 
@@ skipping 49 matching lines @@
   BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING, "CI", &inputs,
                      &language_code);
   for (size_t i = 0; i < inputs.size(); ++i) {
     EXPECT_NE(ADDRESS_HOME_LINE2, inputs[i].type);
   }
   EXPECT_EQ("fr", language_code);
 }
 
 }  // namespace i18ninput
 }  // namespace autofill