| Index: remoting/host/security_key/remote_security_key_ipc_server_unittest.cc
|
| diff --git a/remoting/host/security_key/remote_security_key_ipc_server_unittest.cc b/remoting/host/security_key/remote_security_key_ipc_server_unittest.cc
|
| index 0b7b2bff1c4ac73fc1cd52ca8f503219bc8e280b..222335fa15b00055954bee124a6922790ed99b7b 100644
|
| --- a/remoting/host/security_key/remote_security_key_ipc_server_unittest.cc
|
| +++ b/remoting/host/security_key/remote_security_key_ipc_server_unittest.cc
|
| @@ -4,12 +4,12 @@
|
|
|
| #include "remoting/host/security_key/remote_security_key_ipc_server.h"
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| #include "ipc/ipc_channel.h"
|
| @@ -50,10 +50,10 @@ class RemoteSecurityKeyIpcServerTest : public testing::Test {
|
|
|
| // Used to allow |message_loop_| to run during tests. The instance is reset
|
| // after each stage of the tests has been completed.
|
| - scoped_ptr<base::RunLoop> run_loop_;
|
| + std::unique_ptr<base::RunLoop> run_loop_;
|
|
|
| // The object under test.
|
| - scoped_ptr<RemoteSecurityKeyIpcServer> remote_security_key_ipc_server_;
|
| + std::unique_ptr<RemoteSecurityKeyIpcServer> remote_security_key_ipc_server_;
|
|
|
| // Used to validate the object under test uses the correct ID when
|
| // communicating over the IPC channel.
|
|
|