Index: cc/test/remote_channel_impl_for_test.cc |
diff --git a/cc/test/remote_channel_impl_for_test.cc b/cc/test/remote_channel_impl_for_test.cc |
index 440aa5422aaba44bacd209985b26b0d8b76c604b..b57b3513d44330f934d9bd1553906059b108696e 100644 |
--- a/cc/test/remote_channel_impl_for_test.cc |
+++ b/cc/test/remote_channel_impl_for_test.cc |
@@ -4,16 +4,17 @@ |
#include "cc/test/remote_channel_impl_for_test.h" |
+#include "base/memory/ptr_util.h" |
#include "cc/test/proxy_impl_for_test.h" |
namespace cc { |
-scoped_ptr<RemoteChannelImplForTest> RemoteChannelImplForTest::Create( |
+std::unique_ptr<RemoteChannelImplForTest> RemoteChannelImplForTest::Create( |
TestHooks* test_hooks, |
LayerTreeHost* layer_tree_host, |
RemoteProtoChannel* remote_proto_channel, |
TaskRunnerProvider* task_runner_provider) { |
- return make_scoped_ptr(new RemoteChannelImplForTest( |
+ return base::WrapUnique(new RemoteChannelImplForTest( |
test_hooks, layer_tree_host, remote_proto_channel, task_runner_provider)); |
} |
@@ -28,12 +29,12 @@ RemoteChannelImplForTest::RemoteChannelImplForTest( |
test_hooks_(test_hooks), |
proxy_impl_for_test_(nullptr) {} |
-scoped_ptr<ProxyImpl> RemoteChannelImplForTest::CreateProxyImpl( |
+std::unique_ptr<ProxyImpl> RemoteChannelImplForTest::CreateProxyImpl( |
ChannelImpl* channel_impl, |
LayerTreeHost* layer_tree_host, |
TaskRunnerProvider* task_runner_provider, |
- scoped_ptr<BeginFrameSource> external_begin_frame_source) { |
- scoped_ptr<ProxyImplForTest> proxy_impl = ProxyImplForTest::Create( |
+ std::unique_ptr<BeginFrameSource> external_begin_frame_source) { |
+ std::unique_ptr<ProxyImplForTest> proxy_impl = ProxyImplForTest::Create( |
test_hooks_, channel_impl, layer_tree_host, task_runner_provider, |
std::move(external_begin_frame_source)); |
proxy_impl_for_test_ = proxy_impl.get(); |