Fix cc unit tests that depend on verify_property_trees=true

cc/test/layer_tree_host_common_test.h

 // Copyright 2014 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.
 
 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/test/fake_layer_tree_host_client.h"
+#include "cc/trees/property_tree.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gfx {
 class PointF;
 class Point3F;
 class Size;
 class Transform;
 }
 
 namespace cc {
@@ skipping 74 matching lines @@
   template <class LayerType>
   void ExecuteCalculateDrawProperties(LayerType* root_layer,
                                       float device_scale_factor,
                                       float page_scale_factor,
                                       LayerType* page_scale_application_layer) {
     ExecuteCalculateDrawProperties(root_layer, device_scale_factor,
                                    page_scale_factor,
                                    page_scale_application_layer, false, false);
   }
 
+  void ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* layer);
+  void ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* layer);
+
   RenderSurfaceLayerList* render_surface_layer_list() const {
     return render_surface_layer_list_.get();
   }
 
   LayerImplList* render_surface_layer_list_impl() const {
     return render_surface_layer_list_impl_.get();
   }
 
   int render_surface_layer_list_count() const {
     return render_surface_layer_list_count_;
   }
 
   scoped_ptr<FakeLayerTreeHost> CreateFakeLayerTreeHost();
 
  private:
   scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_;
   scoped_ptr<std::vector<LayerImpl*>> render_surface_layer_list_impl_;
 
   FakeLayerTreeHostClient client_;
   int render_surface_layer_list_count_;
 };
 
 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase,
                                 public testing::Test {};
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_