| 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 74ff284a51c84135677169c07eb25aa2a6bd0d1e..1e88fde7b90af94fa71d97aacebd3a9c498409dc 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -7428,7 +7428,7 @@ TEST_F(LayerTreeHostImplTest, GetPictureLayerImplPairs) {
|
| LayerImpl* pending_layer = pending_tree->root_layer();
|
|
|
| std::vector<PictureLayerImpl::Pair> layer_pairs;
|
| - host_impl_->GetPictureLayerImplPairs(&layer_pairs);
|
| + host_impl_->GetPictureLayerImplPairs(&layer_pairs, true);
|
| EXPECT_EQ(1u, layer_pairs.size());
|
| EXPECT_EQ(pending_layer, layer_pairs[0].pending);
|
| EXPECT_EQ(nullptr, layer_pairs[0].active);
|
| @@ -7445,7 +7445,7 @@ TEST_F(LayerTreeHostImplTest, GetPictureLayerImplPairs) {
|
| host_impl_->CreatePendingTree();
|
|
|
| layer_pairs.clear();
|
| - host_impl_->GetPictureLayerImplPairs(&layer_pairs);
|
| + host_impl_->GetPictureLayerImplPairs(&layer_pairs, true);
|
| EXPECT_EQ(1u, layer_pairs.size());
|
| EXPECT_EQ(active_layer, layer_pairs[0].active);
|
| EXPECT_EQ(pending_layer, layer_pairs[0].pending);
|
| @@ -7454,7 +7454,7 @@ TEST_F(LayerTreeHostImplTest, GetPictureLayerImplPairs) {
|
| host_impl_->ActivateSyncTree();
|
|
|
| layer_pairs.clear();
|
| - host_impl_->GetPictureLayerImplPairs(&layer_pairs);
|
| + host_impl_->GetPictureLayerImplPairs(&layer_pairs, true);
|
| EXPECT_EQ(1u, layer_pairs.size());
|
| EXPECT_EQ(active_layer, layer_pairs[0].active);
|
| EXPECT_EQ(nullptr, layer_pairs[0].pending);
|
| @@ -7468,7 +7468,7 @@ TEST_F(LayerTreeHostImplTest, GetPictureLayerImplPairs) {
|
| LayerImpl* new_pending_layer = pending_tree->root_layer()->children()[0];
|
|
|
| layer_pairs.clear();
|
| - host_impl_->GetPictureLayerImplPairs(&layer_pairs);
|
| + host_impl_->GetPictureLayerImplPairs(&layer_pairs, true);
|
| EXPECT_EQ(2u, layer_pairs.size());
|
|
|
| // The pair ordering is flaky, so make it consistent.
|
|
|