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

Unified Diff: remoting/protocol/message_reader.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/message_pipe.h ('k') | remoting/protocol/message_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/message_reader.h
diff --git a/remoting/protocol/message_reader.h b/remoting/protocol/message_reader.h
index 4467e687aaa86a3fc60d0548f7f03e4f64b214d7..911425888c8cb7c003493d6108f749c2410a48c4 100644
--- a/remoting/protocol/message_reader.h
+++ b/remoting/protocol/message_reader.h
@@ -5,9 +5,10 @@
#ifndef REMOTING_PROTOCOL_MESSAGE_READER_H_
#define REMOTING_PROTOCOL_MESSAGE_READER_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "remoting/base/compound_buffer.h"
@@ -35,7 +36,7 @@ class P2PStreamSocket;
// e.g. when we the sender sends multiple messages in one TCP packet.
class MessageReader : public base::NonThreadSafe {
public:
- typedef base::Callback<void(scoped_ptr<CompoundBuffer> message)>
+ typedef base::Callback<void(std::unique_ptr<CompoundBuffer> message)>
MessageReceivedCallback;
typedef base::Callback<void(int)> ReadFailedCallback;
@@ -52,7 +53,7 @@ class MessageReader : public base::NonThreadSafe {
void OnRead(int result);
void HandleReadResult(int result, bool* read_succeeded);
void OnDataReceived(net::IOBuffer* data, int data_size);
- void RunCallback(scoped_ptr<CompoundBuffer> message);
+ void RunCallback(std::unique_ptr<CompoundBuffer> message);
ReadFailedCallback read_failed_callback_;
« no previous file with comments | « remoting/protocol/message_pipe.h ('k') | remoting/protocol/message_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698