Index: chrome/browser/chromeos/login/existing_user_controller.cc |
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc |
index 77d49397ac23909a2277acd4e8d2729e965236d5..0ffe89c15a6cf6a2d13f371da299f21c65f833fa 100644 |
--- a/chrome/browser/chromeos/login/existing_user_controller.cc |
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/chromeos/login/existing_user_controller.h" |
+#include <memory> |
#include <vector> |
#include "base/bind.h" |
@@ -11,7 +12,6 @@ |
#include "base/callback.h" |
#include "base/command_line.h" |
#include "base/logging.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/metrics/histogram_macros.h" |
#include "base/strings/string_util.h" |
@@ -1023,7 +1023,7 @@ void ExistingUserController::SendAccessibilityAlert( |
void ExistingUserController::SetPublicSessionKeyboardLayoutAndLogin( |
const UserContext& user_context, |
- scoped_ptr<base::ListValue> keyboard_layouts) { |
+ std::unique_ptr<base::ListValue> keyboard_layouts) { |
UserContext new_user_context = user_context; |
std::string keyboard_layout; |
for (size_t i = 0; i < keyboard_layouts->GetSize(); ++i) { |