cc: Remove separate x/y raster scales.

cc/playback/discardable_image_map_unittest.cc

 // Copyright 2015 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.
 
 #include "cc/playback/discardable_image_map.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 25 matching lines @@
 };
 
 }  // namespace
 
 class DiscardableImageMapTest : public testing::Test {
  public:
   std::vector<PositionScaleDrawImage> GetDiscardableImagesInRect(
       const DiscardableImageMap& image_map,
       const gfx::Rect& rect) {
     std::vector<DrawImage> draw_images;
-    image_map.GetDiscardableImagesInRect(rect, gfx::SizeF(1.f, 1.f),
-                                         &draw_images);
+    image_map.GetDiscardableImagesInRect(rect, 1.f, &draw_images);
 
     std::vector<size_t> indices;
     image_map.images_rtree_.Search(rect, &indices);
     std::vector<PositionScaleDrawImage> position_draw_images;
     for (size_t index : indices) {
       position_draw_images.push_back(
           PositionScaleDrawImage(image_map.all_images_[index].first.image(),
                                  image_map.all_images_[index].second,
                                  image_map.all_images_[index].first.scale()));
     }
@@ skipping 479 matching lines @@
   EXPECT_EQ(gfx::Rect(512 + 6, 2 * 512 + 6, 500, 500), images[1].image_rect);
   EXPECT_TRUE(images[2].image == discardable_image[2][3]);
   EXPECT_EQ(gfx::Rect(3 * 512 + 6, 2 * 512 + 6, 500, 500),
             images[2].image_rect);
   EXPECT_TRUE(images[3].image == discardable_image[3][2]);
   EXPECT_EQ(gfx::Rect(2 * 512 + 6, 3 * 512 + 6, 500, 500),
             images[3].image_rect);
 }
 
 }  // namespace cc