Remove owning_id from EffectNode and replace it by an opaque stable_id

cc/test/layer_tree_json_parser_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/layer_tree_json_parser.h"
 
 #include <stddef.h>
 
 #include "cc/layers/layer.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_test_common.h"
 #include "cc/test/test_task_graph_runner.h"
+#include "cc/trees/effect_node.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 namespace {
 
 bool LayerTreesMatch(LayerImpl* const layer_impl,
                      Layer* const layer) {
 #define RETURN_IF_EXPECTATION_FAILS(exp) \
   do { \
     exp; \
     if (testing::UnitTest::GetInstance()->current_test_info()-> \
             result()->Failed()) \
       return false; \
   } while (0)
 
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_EQ(layer_impl->test_properties()->children.size(),
                 layer->children().size()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->bounds(), layer->bounds()));
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_EQ(layer_impl->position(), layer->position()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_TRANSFORMATION_MATRIX_EQ(
       layer_impl->test_properties()->transform, layer->transform()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->contents_opaque(),
                                         layer->contents_opaque()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->scrollable(),
                                         layer->scrollable()));
+
   RETURN_IF_EXPECTATION_FAILS(
-      EXPECT_FLOAT_EQ(layer_impl->Opacity(), layer->opacity()));
+      EXPECT_FLOAT_EQ(OpacityForLayer(layer_impl), layer->opacity()));
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_EQ(layer_impl->touch_event_handler_region(),
                 layer->touch_event_handler_region()));
 
   for (size_t i = 0; i < layer_impl->test_properties()->children.size(); ++i) {
     RETURN_IF_EXPECTATION_FAILS(
         EXPECT_TRUE(LayerTreesMatch(layer_impl->test_properties()->children[i],
                                     layer->children()[i].get())));
   }
 
@@ skipping 60 matching lines @@
   tree->BuildPropertyTreesForTesting();
 
   std::string json = host_impl.LayerTreeAsJson();
   scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
   ASSERT_TRUE(root.get());
   EXPECT_TRUE(LayerTreesMatch(host_impl.active_tree()->root_layer_for_testing(),
                               root.get()));
 }
 
 }  // namespace cc