cc: Refactor content scale/bounds into draw properties

cc/contents_scaling_layer_unittest.cc

Index: cc/contents_scaling_layer_unittest.cc
diff --git a/cc/contents_scaling_layer_unittest.cc b/cc/contents_scaling_layer_unittest.cc
index 1825641643e9ee57618efde9dcac8bd780a41c0d..c0e839b03c60cc032418dbf83105be8a493177d7 100644
--- a/cc/contents_scaling_layer_unittest.cc
+++ b/cc/contents_scaling_layer_unittest.cc
@@ -46,7 +46,7 @@ TEST(ContentsScalingLayerTest, checkContentsBounds) {
   EXPECT_EQ(320, testLayer->contentBounds().width());
   EXPECT_EQ(240, testLayer->contentBounds().height());
 
-  testLayer->setContentsScale(2.0f);
+  testLayer->setIdealContentsScale(2.0f);
   EXPECT_EQ(640, testLayer->contentBounds().width());
   EXPECT_EQ(480, testLayer->contentBounds().height());
 
@@ -54,7 +54,7 @@ TEST(ContentsScalingLayerTest, checkContentsBounds) {
   EXPECT_EQ(20, testLayer->contentBounds().width());
   EXPECT_EQ(40, testLayer->contentBounds().height());
 
-  testLayer->setContentsScale(1.33f);
+  testLayer->setIdealContentsScale(1.33f);
   EXPECT_EQ(14, testLayer->contentBounds().width());
   EXPECT_EQ(27, testLayer->contentBounds().height());
 }
@@ -68,7 +68,7 @@ TEST(ContentsScalingLayerTest, checkContentsScaleChangeTriggersNeedsDisplay) {
   testLayer->resetNeedsDisplay();
   EXPECT_FALSE(testLayer->needsDisplay());
 
-  testLayer->setContentsScale(testLayer->contentsScaleX() + 1.f);
+  testLayer->setIdealContentsScale(testLayer->contentsScaleX() + 1.f);
   EXPECT_TRUE(testLayer->needsDisplay());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 320, 240),
                        testLayer->lastNeedsDisplayRect());