Revert of Fix bad scaling in TiledLayer

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 26346212af5b9653bc3f0fd21cf83f059113465f..55250f5a79ae419cc51e272ffc4577370f08d5c2 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -44,8 +44,7 @@
   virtual scoped_ptr<LayerUpdater::Resource> CreateResource(
       PrioritizedResourceManager* resource) OVERRIDE;
 
-  virtual void PrepareToUpdate(const gfx::Size& content_size,
-                               const gfx::Rect& paint_rect,
+  virtual void PrepareToUpdate(const gfx::Rect& content_rect,
                                const gfx::Size& tile_size,
                                float contents_width_scale,
                                float contents_height_scale) OVERRIDE;
@@ -54,9 +53,6 @@
   void SetRectToInvalidate(const gfx::Rect& rect, FakeTiledLayer* layer);
   // Last rect passed to PrepareToUpdate().
   gfx::Rect last_update_rect() const { return last_update_rect_; }
-
-  // Value of |contents_width_scale| last passed to PrepareToUpdate().
-  float last_contents_width_scale() const { return last_contents_width_scale_; }
 
   // Number of times PrepareToUpdate has been invoked.
   int prepare_count() const { return prepare_count_; }
@@ -75,7 +71,6 @@
   int update_count_;
   gfx::Rect rect_to_invalidate_;
   gfx::Rect last_update_rect_;
-  float last_contents_width_scale_;
   scoped_refptr<FakeTiledLayer> layer_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeLayerUpdater);