| Index: cc/trees/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
|
| index 5694c01aaa37565bec2f4254a0a41db9cb8092da..f5b6cefebc8dc5d500626ce4fd5a0c98a167fa6a 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -327,7 +327,7 @@ class LayerTreeHostImplTest : public testing::Test,
|
| on_can_draw_state_changed_called_ = false;
|
|
|
| // Toggle the root layer to make sure it toggles can_draw
|
| - host_impl_->active_tree()->SetRootLayer(scoped_ptr<LayerImpl>());
|
| + host_impl_->active_tree()->SetRootLayer(nullptr);
|
| EXPECT_FALSE(host_impl_->CanDraw());
|
| EXPECT_TRUE(on_can_draw_state_changed_called_);
|
| on_can_draw_state_changed_called_ = false;
|
| @@ -6749,7 +6749,7 @@ TEST_F(LayerTreeHostImplTest, ScrollInvisibleScrollerWithVisibleScrollChild) {
|
| scoped_ptr<LayerImpl> container =
|
| LayerImpl::Create(host_impl_->active_tree(), container_id);
|
|
|
| - scoped_ptr<std::set<LayerImpl*> > scroll_children(new std::set<LayerImpl*>());
|
| + scoped_ptr<std::set<LayerImpl*>> scroll_children(new std::set<LayerImpl*>);
|
| scroll_children->insert(scroll_child.get());
|
| invisible_scroll->SetScrollChildren(scroll_children.release());
|
|
|
|
|