Index: remoting/host/security_key/fake_remote_security_key_ipc_server.h |
diff --git a/remoting/host/security_key/fake_remote_security_key_ipc_server.h b/remoting/host/security_key/fake_remote_security_key_ipc_server.h |
index bddd6303aa1c9502b4b3bc7351549af2a2569a73..6b4f0a0ff885dec4e891d7d439a05418691c3249 100644 |
--- a/remoting/host/security_key/fake_remote_security_key_ipc_server.h |
+++ b/remoting/host/security_key/fake_remote_security_key_ipc_server.h |
@@ -8,11 +8,11 @@ |
#include "remoting/host/security_key/remote_security_key_ipc_server.h" |
#include <map> |
+#include <memory> |
#include <string> |
#include "base/callback_forward.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "ipc/ipc_listener.h" |
@@ -90,7 +90,7 @@ class FakeRemoteSecurityKeyIpcServer : public RemoteSecurityKeyIpcServer, |
base::Closure send_response_callback_; |
// Used for sending/receiving security key messages between processes. |
- scoped_ptr<IPC::Channel> ipc_channel_; |
+ std::unique_ptr<IPC::Channel> ipc_channel_; |
// NOTE: Weak pointers must be invalidated before all other member variables. |
base::WeakPtrFactory<FakeRemoteSecurityKeyIpcServer> weak_factory_; |
@@ -109,7 +109,7 @@ class FakeRemoteSecurityKeyIpcServerFactory |
~FakeRemoteSecurityKeyIpcServerFactory() override; |
// RemoteSecurityKeyIpcServerFactory implementation. |
- scoped_ptr<RemoteSecurityKeyIpcServer> Create( |
+ std::unique_ptr<RemoteSecurityKeyIpcServer> Create( |
int connection_id, |
base::TimeDelta initial_connect_timeout, |
const GnubbyAuthHandler::SendMessageCallback& message_callback, |
@@ -130,4 +130,4 @@ class FakeRemoteSecurityKeyIpcServerFactory |
} // namespace remoting |
-#endif // REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_IPC_SERVER_H_ |
+#endif // REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_IPC_SERVER_H_ |