| Index: base/i18n/time_formatting_unittest.cc
|
| diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc
|
| index 665b715ee9b9615129a8329adcc85f1c3d0e1361..b07eb47ac92d67aaa510ed623b37e0544a24222e 100644
|
| --- a/base/i18n/time_formatting_unittest.cc
|
| +++ b/base/i18n/time_formatting_unittest.cc
|
| @@ -4,8 +4,9 @@
|
|
|
| #include "base/i18n/time_formatting.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/i18n/rtl.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/test/icu_test_util.h"
|
| #include "base/time/time.h"
|
| @@ -28,8 +29,8 @@ const Time::Exploded kTestDateTimeExploded = {
|
| // see https://en.wikipedia.org/wiki/Daylight_saving_time for details.
|
| base::string16 GetShortTimeZone(const Time& time) {
|
| UErrorCode status = U_ZERO_ERROR;
|
| - scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
|
| - scoped_ptr<icu::TimeZoneFormat> zone_formatter(
|
| + std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
|
| + std::unique_ptr<icu::TimeZoneFormat> zone_formatter(
|
| icu::TimeZoneFormat::createInstance(icu::Locale::getDefault(), status));
|
| EXPECT_TRUE(U_SUCCESS(status));
|
| icu::UnicodeString name;
|
|
|