| Index: cc/test/threaded_channel_for_test.h
|
| diff --git a/cc/test/threaded_channel_for_test.h b/cc/test/threaded_channel_for_test.h
|
| index 6a47d10cfb990567f9c3ff1101d7001e703ae61b..f48423a0ce060a6d56cbfa3a2b2d9a9d8f8fcc79 100644
|
| --- a/cc/test/threaded_channel_for_test.h
|
| +++ b/cc/test/threaded_channel_for_test.h
|
| @@ -15,7 +15,7 @@ class ProxyImplForTest;
|
| // ThreadedChannel that notifies |test_hooks| of internal actions by ProxyImpl.
|
| class ThreadedChannelForTest : public ThreadedChannel {
|
| public:
|
| - static scoped_ptr<ThreadedChannelForTest> Create(
|
| + static std::unique_ptr<ThreadedChannelForTest> Create(
|
| TestHooks* test_hooks,
|
| ProxyMain* proxy_main,
|
| TaskRunnerProvider* task_runner_provider);
|
| @@ -27,11 +27,11 @@ class ThreadedChannelForTest : public ThreadedChannel {
|
| ProxyMain* proxy_main,
|
| TaskRunnerProvider* task_runner_provider);
|
|
|
| - scoped_ptr<ProxyImpl> CreateProxyImpl(
|
| + std::unique_ptr<ProxyImpl> CreateProxyImpl(
|
| ChannelImpl* channel_impl,
|
| LayerTreeHost* layer_tree_host,
|
| TaskRunnerProvider* task_runner_provider,
|
| - scoped_ptr<BeginFrameSource> external_begin_frame_source) override;
|
| + std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
|
|
|
| TestHooks* test_hooks_;
|
| ProxyImplForTest* proxy_impl_for_test_;
|
|
|