Cleanup changes related to replacing usage of GetImageScale with GetScaleForScaleFactor

chrome/browser/history/select_favicon_frames_unittest.cc

 // Copyright (c) 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.
 
 #include "components/favicon_base/select_favicon_frames.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/layout.h"
@@ skipping 26 matching lines @@
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, w, h);
   bitmap.allocPixels();
   bitmap.eraseColor(color);
   return bitmap;
 }
 
 SkColor GetColor(const gfx::ImageSkia& image, ui::ScaleFactor factor,
                  int x = -1, int y = -1) {
   const SkBitmap& bitmap =
-      image.GetRepresentation(ui::GetImageScale(factor)).sk_bitmap();
+      image.GetRepresentation(ui::GetScaleForScaleFactor(factor)).sk_bitmap();
   if (x == -1)
     x = bitmap.width() / 2;
   if (y == -1)
     y = bitmap.width() / 2;
   bitmap.lockPixels();
   SkColor color = bitmap.getColor(x, y);
   bitmap.unlockPixels();
   return color;
 }
 
@@ skipping 207 matching lines @@
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));
   vector<gfx::Size> sizes2;
   sizes2.push_back(gfx::Size(15, 15));
   float score2;
   SelectFaviconFrames(bitmaps2, sizes2, Scale1x(), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 }  // namespace