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

Unified Diff: remoting/protocol/stream_message_pipe_adapter.h

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_channel_factory.h ('k') | remoting/protocol/stream_message_pipe_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/stream_message_pipe_adapter.h
diff --git a/remoting/protocol/stream_message_pipe_adapter.h b/remoting/protocol/stream_message_pipe_adapter.h
index 37d694ead35d715996e2c1e957f574b2c108279c..b75bbdde5ced60fe0896467a4fe6f4d0e510a3c6 100644
--- a/remoting/protocol/stream_message_pipe_adapter.h
+++ b/remoting/protocol/stream_message_pipe_adapter.h
@@ -24,7 +24,7 @@ class StreamMessagePipeAdapter : public MessagePipe {
public:
typedef base::Callback<void(int)> ErrorCallback;
- StreamMessagePipeAdapter(scoped_ptr<P2PStreamSocket> socket,
+ StreamMessagePipeAdapter(std::unique_ptr<P2PStreamSocket> socket,
const ErrorCallback& error_callback);
~StreamMessagePipeAdapter() override;
@@ -36,11 +36,11 @@ class StreamMessagePipeAdapter : public MessagePipe {
private:
void CloseOnError(int error);
- scoped_ptr<P2PStreamSocket> socket_;
+ std::unique_ptr<P2PStreamSocket> socket_;
ErrorCallback error_callback_;
MessageReader reader_;
- scoped_ptr<BufferedSocketWriter> writer_;
+ std::unique_ptr<BufferedSocketWriter> writer_;
DISALLOW_COPY_AND_ASSIGN(StreamMessagePipeAdapter);
};
@@ -61,7 +61,7 @@ class StreamMessageChannelFactoryAdapter : public MessageChannelFactory {
private:
void OnChannelCreated(const ChannelCreatedCallback& callback,
- scoped_ptr<P2PStreamSocket> socket);
+ std::unique_ptr<P2PStreamSocket> socket);
StreamChannelFactory* stream_channel_factory_;
ErrorCallback error_callback_;
« no previous file with comments | « remoting/protocol/stream_channel_factory.h ('k') | remoting/protocol/stream_message_pipe_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698