Index: cc/test/layer_test_common.cc |
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc |
index 0ef1f02ad21025c0a8e384d27b535a9eddf3daba..23b4144d28df83219403c93e9c34eea999832451 100644 |
--- a/cc/test/layer_test_common.cc |
+++ b/cc/test/layer_test_common.cc |
@@ -125,7 +125,7 @@ LayerTestCommon::LayerImplTest::LayerImplTest(const LayerTreeSettings& settings) |
host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_, settings)), |
render_pass_(RenderPass::Create()), |
layer_impl_id_(2) { |
- scoped_ptr<LayerImpl> root = |
+ std::unique_ptr<LayerImpl> root = |
LayerImpl::Create(host_->host_impl()->active_tree(), 1); |
host_->host_impl()->active_tree()->SetRootLayer(std::move(root)); |
root_layer()->SetHasRenderSurface(true); |
@@ -207,10 +207,10 @@ void LayerTestCommon::LayerImplTest::AppendSurfaceQuadsWithOcclusion( |
SK_ColorBLACK, 1.f, nullptr, &data, RenderPassId(1, 1)); |
} |
-void EmptyCopyOutputCallback(scoped_ptr<CopyOutputResult> result) {} |
+void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {} |
void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() { |
- std::vector<scoped_ptr<CopyOutputRequest>> copy_requests; |
+ std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests; |
copy_requests.push_back( |
CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback))); |
root_layer()->PassCopyRequests(©_requests); |