| Index: remoting/host/security_key/remote_security_key_ipc_server.h
|
| diff --git a/remoting/host/security_key/remote_security_key_ipc_server.h b/remoting/host/security_key/remote_security_key_ipc_server.h
|
| index cd85541a17a715dfca0b481526f099dee40c40e6..9c754f65b23ebc0b7a2859110eabdb642abc5a49 100644
|
| --- a/remoting/host/security_key/remote_security_key_ipc_server.h
|
| +++ b/remoting/host/security_key/remote_security_key_ipc_server.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_IPC_SERVER_H_
|
| #define REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_IPC_SERVER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/callback_forward.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "remoting/host/security_key/gnubby_auth_handler.h"
|
|
|
| @@ -23,7 +23,7 @@ class RemoteSecurityKeyIpcServer {
|
| virtual ~RemoteSecurityKeyIpcServer() {}
|
|
|
| // Creates a new RemoteSecurityKeyIpcServer instance.
|
| - static scoped_ptr<RemoteSecurityKeyIpcServer> Create(
|
| + static std::unique_ptr<RemoteSecurityKeyIpcServer> Create(
|
| int connection_id,
|
| base::TimeDelta initial_connect_timeout,
|
| const GnubbyAuthHandler::SendMessageCallback& message_callback,
|
| @@ -46,7 +46,7 @@ class RemoteSecurityKeyIpcServerFactory {
|
| public:
|
| virtual ~RemoteSecurityKeyIpcServerFactory() {}
|
|
|
| - virtual scoped_ptr<RemoteSecurityKeyIpcServer> Create(
|
| + virtual std::unique_ptr<RemoteSecurityKeyIpcServer> Create(
|
| int connection_id,
|
| base::TimeDelta connect_timeout,
|
| const GnubbyAuthHandler::SendMessageCallback& message_callback,
|
|
|