Cleanup changes related to replacing usage of GetImageScale with GetScaleForScaleFactor

chrome/browser/extensions/extension_icon_image_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 "chrome/browser/extensions/extension_icon_image.h"
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/image_loader.h"
@@ skipping 13 matching lines @@
 
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::IconImage;
 using extensions::Manifest;
 
 namespace {
 
 SkBitmap CreateBlankBitmapForScale(int size_dip, ui::ScaleFactor scale_factor) {
   SkBitmap bitmap;
-  const float scale = ui::GetImageScale(scale_factor);
+  const float scale = ui::GetScaleForScaleFactor(scale_factor);
   bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                    static_cast<int>(size_dip * scale),
                    static_cast<int>(size_dip * scale));
   bitmap.allocPixels();
   bitmap.eraseColor(SkColorSetARGB(0, 0, 0, 0));
   return bitmap;
 }
 
 SkBitmap EnsureBitmapSize(const SkBitmap& original, int size) {
   if (original.width() == size && original.height() == size)
@@ skipping 520 matching lines @@
 
   // When requesting another representation, we should not crash and return some
   // image of the size. It could be blank or a rescale from the existing 1.0f
   // icon.
   representation = image_skia.GetRepresentation(2.0f);
 
   EXPECT_EQ(16, representation.GetWidth());
   EXPECT_EQ(16, representation.GetHeight());
   EXPECT_EQ(2.0f, representation.scale());
 }