| Index: cc/trees/layer_tree_host_unittest_delegated.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| index 380113a804a4293320cd2c520aaa45aff2826470..f0814bfc776b7465d681ac31edd65f1eafac06a4 100644
|
| --- a/cc/trees/layer_tree_host_unittest_delegated.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| @@ -1109,6 +1109,9 @@ class LayerTreeHostDelegatedTestResourceSentToParent
|
| TransferableResourceArray transferable_resources;
|
| host_impl->resource_provider()->PrepareSendToParent(
|
| resources_for_parent, &transferable_resources);
|
| +
|
| + resource_in_grandparent = transferable_resources[0];
|
| + EXPECT_EQ(map.find(999)->second, resource_in_grandparent.id);
|
| break;
|
| }
|
| case 2: {
|
| @@ -1121,10 +1124,10 @@ class LayerTreeHostDelegatedTestResourceSentToParent
|
| EXPECT_EQ(1u, delegated_impl->Resources().count(map.find(555)->second));
|
|
|
| // Receive 999 back from the grandparent.
|
| - TransferableResource resource;
|
| - resource.id = map.find(999)->second;
|
| + EXPECT_EQ(map.find(999)->second, resource_in_grandparent.id);
|
| TransferableResourceArray transferable_resources;
|
| - transferable_resources.push_back(resource);
|
| + transferable_resources.push_back(resource_in_grandparent);
|
| +
|
| host_impl->resource_provider()->ReceiveFromParent(
|
| transferable_resources);
|
| break;
|
| @@ -1140,6 +1143,8 @@ class LayerTreeHostDelegatedTestResourceSentToParent
|
| }
|
|
|
| virtual void AfterTest() OVERRIDE {}
|
| +
|
| + TransferableResource resource_in_grandparent;
|
| };
|
|
|
| SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestResourceSentToParent);
|
|
|