| Index: third_party/libaddressinput/chromium/libaddressinput_util.h
|
| diff --git a/third_party/libaddressinput/chromium/addressinput_util.h b/third_party/libaddressinput/chromium/libaddressinput_util.h
|
| similarity index 65%
|
| copy from third_party/libaddressinput/chromium/addressinput_util.h
|
| copy to third_party/libaddressinput/chromium/libaddressinput_util.h
|
| index e3bdaa4cc7c91a14cb6dc2bc69dcfc6ceb46fb66..f03528da1525658626b2f2ad2a37527d3333f296 100644
|
| --- a/third_party/libaddressinput/chromium/addressinput_util.h
|
| +++ b/third_party/libaddressinput/chromium/libaddressinput_util.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_ADDRESSINPUT_UTIL_H_
|
| -#define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_ADDRESSINPUT_UTIL_H_
|
| +#ifndef THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_LIBADDRESSINPUT_UTIL_H_
|
| +#define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_LIBADDRESSINPUT_UTIL_H_
|
|
|
| #include <map>
|
|
|
| -#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_field.h"
|
| -#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_problem.h"
|
| +#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
|
| +#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_problem.h"
|
|
|
| namespace i18n {
|
| namespace addressinput {
|
| @@ -32,11 +32,11 @@ bool HasAllRequiredFields(
|
| void ValidateRequiredFields(
|
| const ::i18n::addressinput::AddressData& address_to_check,
|
| const std::multimap< ::i18n::addressinput::AddressField,
|
| - ::i18n::addressinput::AddressProblem::Type>* filter,
|
| + ::i18n::addressinput::AddressProblem>* filter,
|
| std::multimap< ::i18n::addressinput::AddressField,
|
| - ::i18n::addressinput::AddressProblem::Type>* problems);
|
| + ::i18n::addressinput::AddressProblem>* problems);
|
|
|
| } // namespace addressinput
|
| } // namespace autofill
|
|
|
| -#endif // THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_ADDRESSINPUT_UTIL_H_
|
| +#endif // THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_LIBADDRESSINPUT_UTIL_H_
|
|
|