cc: Refactor content scale/bounds into draw properties

cc/layer_tree_host_unittest.cc

Index: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index 7add7caf714d43f12eb9a779f7ad4971d7ad5b73..41744911e8c1e6414d4d0205f2add1044be15241 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -1221,9 +1221,18 @@ class NoScaleContentLayer : public ContentLayer {
 public:
     static scoped_refptr<NoScaleContentLayer> create(ContentLayerClient* client) { return make_scoped_refptr(new NoScaleContentLayer(client)); }
 
-    virtual gfx::Size contentBounds() const OVERRIDE { return bounds(); }
-    virtual float contentsScaleX() const OVERRIDE { return 1.0; }
-    virtual float contentsScaleY() const OVERRIDE { return 1.0; }
+    virtual void calculateContentsScale(
+        float idealContentsScale,
+        float* contentsScaleX,
+        float* contentsScaleY,
+        gfx::Size* contentBounds) OVERRIDE
+    {
+        Layer::calculateContentsScale(
+             idealContentsScale,
+             contentsScaleX,
+             contentsScaleY,
+             contentBounds);
+    }
 
 private:
     explicit NoScaleContentLayer(ContentLayerClient* client)