cc: Compute SurfacePropertyChanged without depending on owning layer

cc/layers/layer_unittest.cc

Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 6662c03f345b12ea80401f270fad5e43a6782d29..9d703c262b252ebc5496b79db5ac3272ea226deb 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -82,23 +82,6 @@ using ::testing::_;
       grand_child->GetLayerTree()->LayerNeedsPushPropertiesForTesting(         \
           grand_child.get()));
 
-#define EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(code_to_test)                    \
-  code_to_test;                                                                \
-  root->GetLayerTree()->BuildPropertyTreesForTesting();                        \
-  EXPECT_TRUE(root->layer_property_changed());                                 \
-  EXPECT_FALSE(root->subtree_property_changed());                              \
-  EXPECT_TRUE(                                                                 \
-      root->GetLayerTree()->LayerNeedsPushPropertiesForTesting(root.get()));   \
-  EXPECT_FALSE(child->layer_property_changed());                               \
-  EXPECT_FALSE(child->subtree_property_changed());                             \
-  EXPECT_FALSE(                                                                \
-      child->GetLayerTree()->LayerNeedsPushPropertiesForTesting(child.get())); \
-  EXPECT_FALSE(grand_child->layer_property_changed());                         \
-  EXPECT_FALSE(grand_child->subtree_property_changed());                       \
-  EXPECT_FALSE(                                                                \
-      grand_child->GetLayerTree()->LayerNeedsPushPropertiesForTesting(         \
-          grand_child.get()));
-
 namespace cc {
 
 // This class is a friend of Layer, and is used as a wrapper for all the tests
@@ -1170,10 +1153,13 @@ TEST_F(LayerTest, LayerPropertyChangedForSubtree) {
       grand_child->PushPropertiesTo(grand_child_impl.get()));
 
   EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1);
-  EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(
+  EXECUTE_AND_VERIFY_SUBTREE_CHANGED(
       root->SetBackgroundFilters(arbitrary_filters));
   EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET(
-      root->PushPropertiesTo(root_impl.get()));
+      root->PushPropertiesTo(root_impl.get());
+      child->PushPropertiesTo(child_impl.get());
+      child2->PushPropertiesTo(child2_impl.get());
+      grand_child->PushPropertiesTo(grand_child_impl.get()));
 
   gfx::PointF arbitrary_point_f = gfx::PointF(0.125f, 0.25f);
   EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1);