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

Unified Diff: remoting/protocol/channel_socket_adapter_unittest.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/protocol/channel_socket_adapter_unittest.cc
diff --git a/remoting/protocol/channel_socket_adapter_unittest.cc b/remoting/protocol/channel_socket_adapter_unittest.cc
index bb67eafaf0b4c1771c0cb42fc0cbf2042766d71d..5ddd5598e0b981b5437bf7cee7fa7fca991bfdf7 100644
--- a/remoting/protocol/channel_socket_adapter_unittest.cc
+++ b/remoting/protocol/channel_socket_adapter_unittest.cc
@@ -7,8 +7,9 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -58,7 +59,8 @@ class MockTransportChannel : public cricket::TransportChannel {
// This can't be a real mock method because gmock doesn't support move-only
// return values.
- virtual rtc::scoped_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate() const {
+ virtual rtc::scoped_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate()
+ const {
EXPECT_TRUE(false); // Never called.
return nullptr;
}
@@ -90,7 +92,7 @@ class TransportChannelSocketAdapterTest : public testing::Test {
}
MockTransportChannel channel_;
- scoped_ptr<TransportChannelSocketAdapter> target_;
+ std::unique_ptr<TransportChannelSocketAdapter> target_;
net::CompletionCallback callback_;
int callback_result_;
base::MessageLoopForIO message_loop_;
« no previous file with comments | « remoting/protocol/channel_multiplexer_unittest.cc ('k') | remoting/protocol/chromium_port_allocator_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698