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 19928245bc34ba30ae7bc7aaee691cb56e1a230d..169179ac6d960a147921e587ae186b5b6129fca6 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -99,6 +99,9 @@ public:
     FakeLayerUpdater* fakeLayerUpdater() { return m_fakeUpdater.get(); }
     gfx::RectF updateRect() { return m_updateRect; }
 
+    // Simulate calcDrawProperties.
+    void updateContentsScale(float idealContentsScale);
+
 protected:
     virtual cc::LayerUpdater* updater() const OVERRIDE;
     virtual void createUpdaterIfNeeded() OVERRIDE { }
@@ -114,11 +117,13 @@ 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 calculateContentsScale(
+        float idealContentsScale,
+        float* contentsScaleX,
+        float* contentsScaleY,
+        gfx::Size* contentBounds) OVERRIDE;
+    virtual void didUpdateBounds() OVERRIDE;
 
 protected:
     virtual ~FakeTiledLayerWithScaledBounds();