diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/cc/trees/layer_tree_impl_unittest.cc | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/cc/trees/layer_tree_impl_unittest.cc')
| -rw-r--r-- | chromium/cc/trees/layer_tree_impl_unittest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chromium/cc/trees/layer_tree_impl_unittest.cc b/chromium/cc/trees/layer_tree_impl_unittest.cc index eb8c2524ae0..b68556aea86 100644 --- a/chromium/cc/trees/layer_tree_impl_unittest.cc +++ b/chromium/cc/trees/layer_tree_impl_unittest.cc @@ -1065,9 +1065,6 @@ TEST_F(LayerTreeImplTest, HitTestingRespectsScrollParents) { // This should cause scroll child and its descendants to be affected by // |child|'s clip. scroll_child->test_properties()->scroll_parent = child.get(); - child->test_properties()->scroll_children = - base::MakeUnique<std::set<LayerImpl*>>(); - child->test_properties()->scroll_children->insert(scroll_child.get()); grand_child->SetBounds(gfx::Size(200, 200)); grand_child->SetDrawsContent(true); @@ -2311,7 +2308,7 @@ TEST_F(LayerTreeImplTest, PersistentSwapPromisesAreKeptAlive) { persistent_promises_to_pass; for (size_t i = 0; i < promises_count; ++i) { persistent_promises_to_pass.push_back( - base::MakeUnique<PersistentSwapPromise>()); + std::make_unique<PersistentSwapPromise>()); } for (auto& promise : persistent_promises_to_pass) { @@ -2341,7 +2338,7 @@ TEST_F(LayerTreeImplTest, NotPersistentSwapPromisesAreDroppedWhenSwapFails) { not_persistent_promises_to_pass; for (size_t i = 0; i < promises_count; ++i) { not_persistent_promises_to_pass.push_back( - base::MakeUnique<NotPersistentSwapPromise>()); + std::make_unique<NotPersistentSwapPromise>()); } for (auto& promise : not_persistent_promises_to_pass) { |