| Index: ash/mus/shell_delegate_mus.cc
|
| diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc
|
| index a7b9f2bec1842e359f2a9c4da6e6fb89a5626107..760b09c26f7ad3eb96cd023b8b6a1b88eb11732c 100644
|
| --- a/ash/mus/shell_delegate_mus.cc
|
| +++ b/ash/mus/shell_delegate_mus.cc
|
| @@ -70,7 +70,7 @@ class SessionStateDelegateStub : public SessionStateDelegate {
|
| bool screen_locked_;
|
|
|
| // A pseudo user info.
|
| - scoped_ptr<user_manager::UserInfo> user_info_;
|
| + std::unique_ptr<user_manager::UserInfo> user_info_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
|
| };
|
|
|