| Index: cc/trees/layer_tree_host_common_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
|
| index 2df05aef4d65082bf3bd93a269faa84a079ede79..a72741b15f09c4a0e4e95bf7e7f9ebc4e4f9991c 100644
|
| --- a/cc/trees/layer_tree_host_common_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_common_unittest.cc
|
| @@ -3287,7 +3287,7 @@ TEST_F(LayerTreeHostCommonTest,
|
| host_impl.active_tree()->UpdateDrawProperties(update_lcd_text);
|
|
|
| LayerImpl* grand_child_ptr =
|
| - host_impl.active_tree()->root_layer()->children()[0]->children()[0];
|
| + host_impl.active_tree()->root_layer()->children()[0]->children()[0].get();
|
|
|
| // Though all layers have invertible transforms, matrix multiplication using
|
| // floating-point math makes the draw transform uninvertible.
|
| @@ -5369,7 +5369,7 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
|
| copy_grand_parent_sibling_before_layer->SetHideLayerAndSubtree(true);
|
| copy_grand_parent_sibling_after_layer->SetHideLayerAndSubtree(true);
|
|
|
| - ScopedPtrVector<CopyOutputRequest> copy_requests;
|
| + std::vector<scoped_ptr<CopyOutputRequest>> copy_requests;
|
| copy_requests.push_back(
|
| CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback)));
|
| copy_layer->PassCopyRequests(©_requests);
|
| @@ -5461,7 +5461,7 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {
|
| true, false, false);
|
| copy_child->SetDrawsContent(true);
|
|
|
| - ScopedPtrVector<CopyOutputRequest> copy_requests;
|
| + std::vector<scoped_ptr<CopyOutputRequest>> copy_requests;
|
| copy_requests.push_back(
|
| CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback)));
|
| copy_layer->PassCopyRequests(©_requests);
|
| @@ -8475,7 +8475,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeImpl) {
|
| // Now, even though child has zero opacity, we will configure |grandchild| and
|
| // |greatgrandchild| in several ways that should force the subtree to be
|
| // processed anyhow.
|
| - ScopedPtrVector<CopyOutputRequest> requests;
|
| + std::vector<scoped_ptr<CopyOutputRequest>> requests;
|
| requests.push_back(CopyOutputRequest::CreateEmptyRequest());
|
|
|
| greatgrandchild_ptr->PassCopyRequests(&requests);
|
|
|