| Index: services/shell/public/cpp/initialize_base_and_icu.cc
|
| diff --git a/services/shell/public/cpp/initialize_base_and_icu.cc b/services/shell/public/cpp/initialize_base_and_icu.cc
|
| index 9eb49fa55e5bd79db031a1f5c5dc7aefc0e170b2..4277f4f46f9663cd056d85e0b8937dc02373c2ae 100644
|
| --- a/services/shell/public/cpp/initialize_base_and_icu.cc
|
| +++ b/services/shell/public/cpp/initialize_base_and_icu.cc
|
| @@ -9,9 +9,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/files/file.h"
|
| #include "base/i18n/icu_util.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/rand_util.h"
|
| #include "base/sys_info.h"
|
| #include "mojo/public/c/system/types.h"
|
| @@ -45,7 +46,7 @@ InitializeBase(const uint8_t* icu_data) {
|
| // Olson timezone ID by accessing the zoneinfo files on disk. After
|
| // TimeZone::createDefault is called once here, the timezone ID is
|
| // cached and there's no more need to access the file system.
|
| - scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
|
| + std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
|
| #endif
|
| }
|
| }
|
|
|