| Index: chrome/browser/ui/webui/settings/font_handler.cc
|
| diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc
|
| index b6971aa496f5966f09c5af79b68ef29197d99450..26bbff23ff1525c6c928f64dc0188618900c825c 100644
|
| --- a/chrome/browser/ui/webui/settings/font_handler.cc
|
| +++ b/chrome/browser/ui/webui/settings/font_handler.cc
|
| @@ -47,9 +47,8 @@ void FontHandler::HandleFetchFontsData(const base::ListValue* args) {
|
| callback_id));
|
| }
|
|
|
| -void FontHandler::FontListHasLoaded(
|
| - std::string callback_id,
|
| - scoped_ptr<base::ListValue> list) {
|
| +void FontHandler::FontListHasLoaded(std::string callback_id,
|
| + std::unique_ptr<base::ListValue> list) {
|
| // Font list. Selects the directionality for the fonts in the given list.
|
| for (size_t i = 0; i < list->GetSize(); i++) {
|
| base::ListValue* font;
|
| @@ -73,9 +72,9 @@ void FontHandler::FontListHasLoaded(
|
| pref_service->GetString(prefs::kRecentlySelectedEncoding));
|
| DCHECK(!encodings->empty());
|
|
|
| - scoped_ptr<base::ListValue> encoding_list(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> encoding_list(new base::ListValue());
|
| for (const auto& it : *encodings) {
|
| - scoped_ptr<base::ListValue> option(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> option(new base::ListValue());
|
| if (it.encoding_id) {
|
| option->AppendString(
|
| CharacterEncoding::GetCanonicalEncodingNameByCommandId(
|
|
|