| Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| index 220f3ba8eca22403be79602c4c8f265a879d11cf..3af4df5df9b82d86d688fe8245db0fc7c0aa80eb 100644
|
| --- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| @@ -80,7 +80,7 @@ void AddPublicSessionDetailsToUserDictionaryEntry(
|
|
|
| // Construct the list of available locales. This list consists of the
|
| // recommended locales, followed by all others.
|
| - scoped_ptr<base::ListValue> available_locales =
|
| + std::unique_ptr<base::ListValue> available_locales =
|
| GetUILanguageList(&recommended_locales, std::string());
|
|
|
| // Select the the first recommended locale that is actually available or the
|
| @@ -473,7 +473,8 @@ void UserSelectionScreen::ShowUserPodCustomIcon(
|
| const AccountId& account_id,
|
| const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions&
|
| icon_options) {
|
| - scoped_ptr<base::DictionaryValue> icon = icon_options.ToDictionaryValue();
|
| + std::unique_ptr<base::DictionaryValue> icon =
|
| + icon_options.ToDictionaryValue();
|
| if (!icon || icon->empty())
|
| return;
|
| view_->ShowUserPodCustomIcon(account_id, *icon);
|
|
|