Reland "Use upstream libaddressinput in Chrome."

chrome/browser/ui/autofill/autofill_dialog_i18n_input.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_I18N_INPUT_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_I18N_INPUT_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_common.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "components/autofill/core/browser/autofill_type.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_field.h"
-
-namespace i18n {
-namespace addressinput {
-struct AddressData;
-}
-}
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
 
 namespace autofill {
 
 class AutofillProfile;
 class CreditCard;
 
 namespace i18ninput {
 
 // Builds internationalized address input fields for |address_type| (e.g.
 // billing or shipping) in |country_code| (e.g. "US" or "CH").
@@ skipping 26 matching lines @@
 // Sets |field| to the corresponding address field for the Autofill
 // |server_type|. Returns |true| if |server_type| can be represented as an
 // address field. The |field| parameter can be NULL.
 bool FieldForType(ServerFieldType server_type,
                   ::i18n::addressinput::AddressField* field);
 
 }  // namespace i18ninput
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_I18N_INPUT_H_