Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: remoting/host/security_key/remote_security_key_ipc_server.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/security_key/remote_security_key_ipc_server.cc
diff --git a/remoting/host/security_key/remote_security_key_ipc_server.cc b/remoting/host/security_key/remote_security_key_ipc_server.cc
index 62d54c831dac777120fbdc503de158d8445be565..e3a7877048058106fb364aba918760150d363d12 100644
--- a/remoting/host/security_key/remote_security_key_ipc_server.cc
+++ b/remoting/host/security_key/remote_security_key_ipc_server.cc
@@ -4,10 +4,11 @@
#include "remoting/host/security_key/remote_security_key_ipc_server.h"
+#include <memory>
#include <string>
#include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
#include "ipc/ipc_channel.h"
@@ -31,16 +32,16 @@ void RemoteSecurityKeyIpcServer::SetFactoryForTest(
g_factory = factory;
}
-scoped_ptr<RemoteSecurityKeyIpcServer> RemoteSecurityKeyIpcServer::Create(
+std::unique_ptr<RemoteSecurityKeyIpcServer> RemoteSecurityKeyIpcServer::Create(
int connection_id,
base::TimeDelta initial_connect_timeout,
const GnubbyAuthHandler::SendMessageCallback& message_callback,
const base::Closure& done_callback) {
- scoped_ptr<RemoteSecurityKeyIpcServer> ipc_server =
+ std::unique_ptr<RemoteSecurityKeyIpcServer> ipc_server =
g_factory
? g_factory->Create(connection_id, initial_connect_timeout,
message_callback, done_callback)
- : make_scoped_ptr(new RemoteSecurityKeyIpcServerImpl(
+ : base::WrapUnique(new RemoteSecurityKeyIpcServerImpl(
connection_id, initial_connect_timeout, message_callback,
done_callback));

Powered by Google App Engine
This is Rietveld 408576698