Revert 189830 "cc: Chromify LayerTreeHostCommon"

cc/layers/contents_scaling_layer_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/contents_scaling_layer.h"
 
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
@@ skipping 28 matching lines @@
   }
 
  private:
   virtual ~MockContentsScalingLayer() {}
 
   gfx::RectF last_needs_display_rect_;
 };
 
 void CalcDrawProps(Layer* root, float device_scale) {
     std::vector<scoped_refptr<Layer> > render_surface_layer_list;
-    LayerTreeHostCommon::CalculateDrawProperties(
+    LayerTreeHostCommon::calculateDrawProperties(
         root,
         gfx::Size(500, 500),
         device_scale,
         1.f,
         1024,
         false,
-        &render_surface_layer_list);
+        render_surface_layer_list);
 }
 
 TEST(ContentsScalingLayerTest, CheckContentsBounds) {
   scoped_refptr<MockContentsScalingLayer> test_layer =
       make_scoped_refptr(new MockContentsScalingLayer());
 
   scoped_refptr<Layer> root = Layer::Create();
   root->AddChild(test_layer);
 
   test_layer->SetBounds(gfx::Size(320, 240));
@@ skipping 12 matching lines @@
   EXPECT_EQ(20, test_layer->content_bounds().width());
   EXPECT_EQ(40, test_layer->content_bounds().height());
 
   CalcDrawProps(root, 1.33f);
   EXPECT_EQ(14, test_layer->content_bounds().width());
   EXPECT_EQ(27, test_layer->content_bounds().height());
 }
 
 }  // namespace
 }  // namespace cc