| Index: services/user/user_shell_client.h
|
| diff --git a/services/user/user_shell_client.h b/services/user/user_shell_client.h
|
| index f9c5dda4e074d43ce2b2f72e3b6daa042d7d4dfa..8d97a72a2ec6caf9fd1dc92413862f5ae470d5c4 100644
|
| --- a/services/user/user_shell_client.h
|
| +++ b/services/user/user_shell_client.h
|
| @@ -16,7 +16,7 @@
|
|
|
| namespace user_service {
|
|
|
| -scoped_ptr<shell::ShellClient> CreateUserShellClient(
|
| +std::unique_ptr<shell::ShellClient> CreateUserShellClient(
|
| scoped_refptr<base::SingleThreadTaskRunner> user_service_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner);
|
|
|
| @@ -57,10 +57,10 @@ class UserShellClient
|
| // We create these two objects so we can delete them on the correct task
|
| // runners.
|
| class UserServiceObjects;
|
| - scoped_ptr<UserServiceObjects> user_objects_;
|
| + std::unique_ptr<UserServiceObjects> user_objects_;
|
|
|
| class LevelDBServiceObjects;
|
| - scoped_ptr<LevelDBServiceObjects> leveldb_objects_;
|
| + std::unique_ptr<LevelDBServiceObjects> leveldb_objects_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(UserShellClient);
|
| };
|
|
|