| Index: third_party/libaddressinput/chromium/chrome_metadata_source.h
|
| diff --git a/third_party/libaddressinput/chromium/chrome_metadata_source.h b/third_party/libaddressinput/chromium/chrome_metadata_source.h
|
| index d451f7daa3979ba7943dd4750b7f5b665d564d2f..60ab359d8c7fe9529d3143faabd52082c521dbe7 100644
|
| --- a/third_party/libaddressinput/chromium/chrome_metadata_source.h
|
| +++ b/third_party/libaddressinput/chromium/chrome_metadata_source.h
|
| @@ -6,10 +6,10 @@
|
| #define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_CHROME_METADATA_SOURCE_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/url_request/url_fetcher_delegate.h"
|
| #include "third_party/libaddressinput/src/cpp/include/libaddressinput/source.h"
|
|
|
| @@ -39,14 +39,14 @@ class ChromeMetadataSource : public ::i18n::addressinput::Source,
|
| private:
|
| struct Request {
|
| Request(const std::string& key,
|
| - scoped_ptr<net::URLFetcher> fetcher,
|
| + std::unique_ptr<net::URLFetcher> fetcher,
|
| const Callback& callback);
|
|
|
| std::string key;
|
| // The data that's received.
|
| std::string data;
|
| // The object that manages retrieving the data.
|
| - scoped_ptr<net::URLFetcher> fetcher;
|
| + std::unique_ptr<net::URLFetcher> fetcher;
|
| const Callback& callback;
|
| };
|
|
|
|
|