| Index: components/autofill/core/browser/address_i18n.h
|
| diff --git a/components/autofill/core/browser/address_i18n.h b/components/autofill/core/browser/address_i18n.h
|
| index 8ae3c56903c1e9e4bfe89964524627585ca80ff5..6473ee579d85b84890f85b1875b8a4f56bc32b52 100644
|
| --- a/components/autofill/core/browser/address_i18n.h
|
| +++ b/components/autofill/core/browser/address_i18n.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_I18N_H_
|
| #define COMPONENTS_AUTOFILL_CORE_BROWSER_ADDRESS_I18N_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback_forward.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "components/autofill/core/browser/field_types.h"
|
| #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
|
| @@ -26,13 +27,13 @@ namespace i18n {
|
|
|
| // Creates an AddressData object for internationalized address display or
|
| // validation using |get_info| for field values.
|
| -scoped_ptr< ::i18n::addressinput::AddressData> CreateAddressData(
|
| +std::unique_ptr<::i18n::addressinput::AddressData> CreateAddressData(
|
| const base::Callback<base::string16(const AutofillType&)>& get_info);
|
|
|
| // Creates an |AddressData| from |profile|.
|
| -scoped_ptr< ::i18n::addressinput::AddressData>
|
| - CreateAddressDataFromAutofillProfile(const AutofillProfile& profile,
|
| - const std::string& app_locale);
|
| +std::unique_ptr<::i18n::addressinput::AddressData>
|
| +CreateAddressDataFromAutofillProfile(const AutofillProfile& profile,
|
| + const std::string& app_locale);
|
|
|
| // Returns the corresponding Autofill server type for |field|.
|
| ServerFieldType TypeForField(::i18n::addressinput::AddressField field,
|
|
|