cc: Refactor content scale/bounds into draw properties

cc/test/tiled_layer_test_common.h

Index: cc/test/tiled_layer_test_common.h
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 83934c4232e64cc52856857cc802bf92f954b8d8..753627f2799590659be03576cd5f600009c838f2 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -114,11 +114,9 @@ class FakeTiledLayerWithScaledBounds : public FakeTiledLayer {
 public:
     explicit FakeTiledLayerWithScaledBounds(cc::PrioritizedResourceManager*);
 
-    void setContentBounds(const gfx::Size& contentBounds) { m_forcedContentBounds = contentBounds; }
-    virtual gfx::Size contentBounds() const OVERRIDE;
-    virtual float contentsScaleX() const OVERRIDE;
-    virtual float contentsScaleY() const OVERRIDE;
-    virtual void setContentsScale(float) OVERRIDE;
+    void setContentBounds(const gfx::Size& contentBounds);
+    virtual void setIdealContentsScale(float) OVERRIDE;
+    virtual void didUpdateBounds() OVERRIDE;
 
 protected:
     virtual ~FakeTiledLayerWithScaledBounds();