Index: third_party/libaddressinput/chromium/chrome_address_validator.h |
diff --git a/third_party/libaddressinput/chromium/chrome_address_validator.h b/third_party/libaddressinput/chromium/chrome_address_validator.h |
index 94ae50434e917d1e64294c226dee5c29491ee698..de5b39b71ef64fa2275c50d8d0028059443ab05f 100644 |
--- a/third_party/libaddressinput/chromium/chrome_address_validator.h |
+++ b/third_party/libaddressinput/chromium/chrome_address_validator.h |
@@ -8,11 +8,11 @@ |
#include <stddef.h> |
#include <map> |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/time/time.h" |
#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h" |
@@ -76,8 +76,8 @@ class AddressValidator { |
}; |
// Takes ownership of |source| and |storage|. |
- AddressValidator(scoped_ptr< ::i18n::addressinput::Source> source, |
- scoped_ptr< ::i18n::addressinput::Storage> storage, |
+ AddressValidator(std::unique_ptr<::i18n::addressinput::Source> source, |
+ std::unique_ptr<::i18n::addressinput::Storage> storage, |
LoadRulesListener* load_rules_listener); |
virtual ~AddressValidator(); |
@@ -163,24 +163,25 @@ class AddressValidator { |
void RetryLoadRules(const std::string& region_code); |
// Loads and stores aggregate rules at COUNTRY level. |
- const scoped_ptr< ::i18n::addressinput::PreloadSupplier> supplier_; |
+ const std::unique_ptr<::i18n::addressinput::PreloadSupplier> supplier_; |
// Suggests addresses based on user input. |
- const scoped_ptr<InputSuggester> input_suggester_; |
+ const std::unique_ptr<InputSuggester> input_suggester_; |
// Normalizes addresses into a canonical form. |
- const scoped_ptr< ::i18n::addressinput::AddressNormalizer> normalizer_; |
+ const std::unique_ptr<::i18n::addressinput::AddressNormalizer> normalizer_; |
// Validates addresses. |
- const scoped_ptr<const ::i18n::addressinput::AddressValidator> validator_; |
+ const std::unique_ptr<const ::i18n::addressinput::AddressValidator> |
+ validator_; |
// The callback that |validator_| invokes when it finished validating an |
// address. |
- const scoped_ptr<const ::i18n::addressinput::AddressValidator::Callback> |
+ const std::unique_ptr<const ::i18n::addressinput::AddressValidator::Callback> |
validated_; |
// The callback that |supplier_| invokes when it finished loading rules. |
- const scoped_ptr<const ::i18n::addressinput::PreloadSupplier::Callback> |
+ const std::unique_ptr<const ::i18n::addressinput::PreloadSupplier::Callback> |
rules_loaded_; |
// Not owned delegate to invoke when |suppler_| finished loading rules. Can be |