| Index: cc/test/threaded_channel_for_test.cc
|
| diff --git a/cc/test/threaded_channel_for_test.cc b/cc/test/threaded_channel_for_test.cc
|
| index 468eec3b66a2cd5cd2a324a2688be67179cba738..ecfd5ca6ee18b22dc5f3cabf635d9900ad927c08 100644
|
| --- a/cc/test/threaded_channel_for_test.cc
|
| +++ b/cc/test/threaded_channel_for_test.cc
|
| @@ -4,15 +4,16 @@
|
|
|
| #include "cc/test/threaded_channel_for_test.h"
|
|
|
| +#include "base/memory/ptr_util.h"
|
| #include "cc/test/proxy_impl_for_test.h"
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<ThreadedChannelForTest> ThreadedChannelForTest::Create(
|
| +std::unique_ptr<ThreadedChannelForTest> ThreadedChannelForTest::Create(
|
| TestHooks* test_hooks,
|
| ProxyMain* proxy_main,
|
| TaskRunnerProvider* task_runner_provider) {
|
| - return make_scoped_ptr(
|
| + return base::WrapUnique(
|
| new ThreadedChannelForTest(test_hooks, proxy_main, task_runner_provider));
|
| }
|
|
|
| @@ -24,12 +25,12 @@ ThreadedChannelForTest::ThreadedChannelForTest(
|
| test_hooks_(test_hooks),
|
| proxy_impl_for_test_(nullptr) {}
|
|
|
| -scoped_ptr<ProxyImpl> ThreadedChannelForTest::CreateProxyImpl(
|
| +std::unique_ptr<ProxyImpl> ThreadedChannelForTest::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();
|
|
|