Revert of Fix bad scaling in TiledLayer

cc/test/tiled_layer_test_common.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TEST_TILED_LAYER_TEST_COMMON_H_
 #define CC_TEST_TILED_LAYER_TEST_COMMON_H_
 
 #include "cc/base/region.h"
 #include "cc/layers/tiled_layer.h"
 #include "cc/layers/tiled_layer_impl.h"
@@ skipping 26 matching lines @@
     SkBitmap bitmap_;
 
     DISALLOW_COPY_AND_ASSIGN(Resource);
   };
 
   FakeLayerUpdater();
 
   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;
   // Sets the rect to invalidate during the next call to PrepareToUpdate().
   // After the next call to PrepareToUpdate() the rect is reset.
   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_; }
   void ClearPrepareCount() { prepare_count_ = 0; }
 
   // Number of times Update() has been invoked on a texture.
   int update_count() const { return update_count_; }
   void ClearUpdateCount() { update_count_ = 0; }
   void Update() { update_count_++; }
 
  protected:
   virtual ~FakeLayerUpdater();
 
  private:
   int prepare_count_;
   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);
 };
 
 class FakeTiledLayerImpl : public TiledLayerImpl {
  public:
   FakeTiledLayerImpl(LayerTreeImpl* tree_impl, int id);
   virtual ~FakeTiledLayerImpl();
 
@@ skipping 58 matching lines @@
   virtual ~FakeTiledLayerWithScaledBounds();
   gfx::Size forced_content_bounds_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeTiledLayerWithScaledBounds);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TILED_LAYER_TEST_COMMON_H_