| Index: chrome/browser/chromeos/system/timezone_util.cc
|
| diff --git a/chrome/browser/chromeos/system/timezone_util.cc b/chrome/browser/chromeos/system/timezone_util.cc
|
| index 9c24b2e25cecea17eec5300dcebd6014c6accb93..be305fa9168b16c1690a27d25be7e1aa99cbdc34 100644
|
| --- a/chrome/browser/chromeos/system/timezone_util.cc
|
| +++ b/chrome/browser/chromeos/system/timezone_util.cc
|
| @@ -68,7 +68,7 @@ base::string16 GetExemplarCity(const icu::TimeZone& zone) {
|
|
|
| // Resource keys for timezones use ':' in place of '/'.
|
| base::ReplaceSubstringsAfterOffset(&zone_id_str, 0, "/", ":");
|
| - scoped_ptr<UResourceBundle, UResClose> zone_item(
|
| + std::unique_ptr<UResourceBundle, UResClose> zone_item(
|
| ures_getByKey(zone_strings, zone_id_str.c_str(), NULL, &status));
|
| icu::UnicodeString city;
|
| if (!U_FAILURE(status)) {
|
| @@ -145,10 +145,10 @@ namespace chromeos {
|
| namespace system {
|
|
|
| // Creates a list of pairs of each timezone's ID and name.
|
| -scoped_ptr<base::ListValue> GetTimezoneList() {
|
| +std::unique_ptr<base::ListValue> GetTimezoneList() {
|
| const std::vector<icu::TimeZone*> &timezones =
|
| chromeos::system::TimezoneSettings::GetInstance()->GetTimezoneList();
|
| - scoped_ptr<base::ListValue> timezoneList(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> timezoneList(new base::ListValue());
|
| for (std::vector<icu::TimeZone*>::const_iterator iter = timezones.begin();
|
| iter != timezones.end(); ++iter) {
|
| const icu::TimeZone* timezone = *iter;
|
|
|