Revert 189830 "cc: Chromify LayerTreeHostCommon"

cc/layers/layer_iterator_unittest.cc

 // Copyright 2012 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/layers/layer_iterator.h"
 
 #include "cc/layers/layer.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 119 matching lines @@
   scoped_refptr<TestLayer> fourth = TestLayer::Create();
 
   root_layer->CreateRenderSurface();
 
   root_layer->AddChild(first);
   root_layer->AddChild(second);
   root_layer->AddChild(third);
   root_layer->AddChild(fourth);
 
   std::vector<scoped_refptr<Layer> > render_surface_layerList;
-  LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
+  LayerTreeHostCommon::calculateDrawProperties(root_layer.get(),
                                                root_layer->bounds(),
                                                1,
                                                1,
                                                256,
                                                false,
-                                               &render_surface_layerList);
+                                               render_surface_layerList);
 
   IterateBackToFront(&render_surface_layerList);
   EXPECT_COUNT(root_layer, 0, -1, 1);
   EXPECT_COUNT(first, -1, -1, 2);
   EXPECT_COUNT(second, -1, -1, 3);
   EXPECT_COUNT(third, -1, -1, 4);
   EXPECT_COUNT(fourth, -1, -1, 5);
 
   IterateFrontToBack(&render_surface_layerList);
   EXPECT_COUNT(root_layer, 5, -1, 4);
@@ skipping 20 matching lines @@
   root_layer->AddChild(root1);
   root_layer->AddChild(root2);
   root_layer->AddChild(root3);
   root2->AddChild(root21);
   root2->AddChild(root22);
   root2->AddChild(root23);
   root22->AddChild(root221);
   root23->AddChild(root231);
 
   std::vector<scoped_refptr<Layer> > render_surface_layerList;
-  LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
+  LayerTreeHostCommon::calculateDrawProperties(root_layer.get(),
                                                root_layer->bounds(),
                                                1,
                                                1,
                                                256,
                                                false,
-                                               &render_surface_layerList);
+                                               render_surface_layerList);
 
   IterateBackToFront(&render_surface_layerList);
   EXPECT_COUNT(root_layer, 0, -1, 1);
   EXPECT_COUNT(root1, -1, -1, 2);
   EXPECT_COUNT(root2, -1, -1, 3);
   EXPECT_COUNT(root21, -1, -1, 4);
   EXPECT_COUNT(root22, -1, -1, 5);
   EXPECT_COUNT(root221, -1, -1, 6);
   EXPECT_COUNT(root23, -1, -1, 7);
   EXPECT_COUNT(root231, -1, -1, 8);
@@ skipping 35 matching lines @@
   root2->SetForceRenderSurface(true);  // Force the layer to own a new surface.
   root2->AddChild(root21);
   root2->AddChild(root22);
   root2->AddChild(root23);
   root22->SetOpacity(0.5f);
   root22->AddChild(root221);
   root23->SetOpacity(0.5f);
   root23->AddChild(root231);
 
   std::vector<scoped_refptr<Layer> > render_surface_layerList;
-  LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
+  LayerTreeHostCommon::calculateDrawProperties(root_layer.get(),
                                                root_layer->bounds(),
                                                1,
                                                1,
                                                256,
                                                false,
-                                               &render_surface_layerList);
+                                               render_surface_layerList);
 
   IterateBackToFront(&render_surface_layerList);
   EXPECT_COUNT(root_layer, 0, -1, 1);
   EXPECT_COUNT(root1, -1, -1, 2);
   EXPECT_COUNT(root2, 4, 3, -1);
   EXPECT_COUNT(root21, -1, -1, 5);
   EXPECT_COUNT(root22, 7, 6, 8);
   EXPECT_COUNT(root221, -1, -1, 9);
   EXPECT_COUNT(root23, 11, 10, 12);
   EXPECT_COUNT(root231, -1, -1, 13);
   EXPECT_COUNT(root3, -1, -1, 14);
 
   IterateFrontToBack(&render_surface_layerList);
   EXPECT_COUNT(root_layer, 14, -1, 13);
   EXPECT_COUNT(root1, -1, -1, 12);
   EXPECT_COUNT(root2, 10, 11, -1);
   EXPECT_COUNT(root21, -1, -1, 9);
   EXPECT_COUNT(root22, 7, 8, 6);
   EXPECT_COUNT(root221, -1, -1, 5);
   EXPECT_COUNT(root23, 3, 4, 2);
   EXPECT_COUNT(root231, -1, -1, 1);
   EXPECT_COUNT(root3, -1, -1, 0);
 }
 
 }  // namespace
 }  // namespace cc