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

Unified Diff: remoting/protocol/stream_message_pipe_adapter.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
« no previous file with comments | « remoting/protocol/stream_message_pipe_adapter.h ('k') | remoting/protocol/third_party_authenticator_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/stream_message_pipe_adapter.cc
diff --git a/remoting/protocol/stream_message_pipe_adapter.cc b/remoting/protocol/stream_message_pipe_adapter.cc
index ff8597aa740ff66faa8b8a56abbe583fdf898e6b..96bd32ba795f9a00156030d9460afd6eccdae5f4 100644
--- a/remoting/protocol/stream_message_pipe_adapter.cc
+++ b/remoting/protocol/stream_message_pipe_adapter.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
+#include "base/memory/ptr_util.h"
#include "net/base/net_errors.h"
#include "remoting/base/buffered_socket_writer.h"
#include "remoting/base/compound_buffer.h"
@@ -19,7 +20,7 @@ namespace remoting {
namespace protocol {
StreamMessagePipeAdapter::StreamMessagePipeAdapter(
- scoped_ptr<P2PStreamSocket> socket,
+ std::unique_ptr<P2PStreamSocket> socket,
const ErrorCallback& error_callback)
: socket_(std::move(socket)),
error_callback_(error_callback),
@@ -79,12 +80,12 @@ void StreamMessageChannelFactoryAdapter::CancelChannelCreation(
void StreamMessageChannelFactoryAdapter::OnChannelCreated(
const ChannelCreatedCallback& callback,
- scoped_ptr<P2PStreamSocket> socket) {
+ std::unique_ptr<P2PStreamSocket> socket) {
if (!socket) {
error_callback_.Run(net::ERR_FAILED);
return;
}
- callback.Run(make_scoped_ptr(
+ callback.Run(base::WrapUnique(
new StreamMessagePipeAdapter(std::move(socket), error_callback_)));
}
« no previous file with comments | « remoting/protocol/stream_message_pipe_adapter.h ('k') | remoting/protocol/third_party_authenticator_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698