Index: remoting/protocol/connection_tester.h |
diff --git a/remoting/protocol/connection_tester.h b/remoting/protocol/connection_tester.h |
index 59ce49e64eb70ba402aed16b5b4d4c68b7559cc3..4fbf33891c6cd11028a444a0b3becff62c4dcce6 100644 |
--- a/remoting/protocol/connection_tester.h |
+++ b/remoting/protocol/connection_tester.h |
@@ -6,10 +6,10 @@ |
#define REMOTING_PROTOCOL_CONNECTION_TESTER_H_ |
#include <list> |
+#include <memory> |
#include <vector> |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/run_loop.h" |
namespace base { |
@@ -123,7 +123,7 @@ class MessagePipeConnectionTester { |
void RunAndCheckResults(); |
protected: |
- void OnMessageReceived(scoped_ptr<CompoundBuffer> message); |
+ void OnMessageReceived(std::unique_ptr<CompoundBuffer> message); |
private: |
base::RunLoop run_loop_; |
@@ -132,8 +132,8 @@ class MessagePipeConnectionTester { |
int message_size_; |
int message_count_; |
- std::vector<scoped_ptr<VideoPacket>> sent_messages_; |
- std::vector<scoped_ptr<VideoPacket>> received_messages_; |
+ std::vector<std::unique_ptr<VideoPacket>> sent_messages_; |
+ std::vector<std::unique_ptr<VideoPacket>> received_messages_; |
}; |
} // namespace protocol |