Cleanup changes related to replacing usage of GetImageScale with GetScaleForScaleFactor

ui/base/layout_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 "ui/base/layout.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/command_line.h"
 #include "ui/base/ui_base_switches.h"
 #endif
 
 namespace ui {
 
 TEST(LayoutTest, GetScaleFactorScale) {
-  EXPECT_FLOAT_EQ(1.0f, GetImageScale(SCALE_FACTOR_100P));
-  EXPECT_FLOAT_EQ(1.25f, GetImageScale(SCALE_FACTOR_125P));
-  EXPECT_FLOAT_EQ(1.33f, GetImageScale(SCALE_FACTOR_133P));
-  EXPECT_FLOAT_EQ(1.4f, GetImageScale(SCALE_FACTOR_140P));
-  EXPECT_FLOAT_EQ(1.5f, GetImageScale(SCALE_FACTOR_150P));
-  EXPECT_FLOAT_EQ(1.8f, GetImageScale(SCALE_FACTOR_180P));
-  EXPECT_FLOAT_EQ(2.0f, GetImageScale(SCALE_FACTOR_200P));
-  EXPECT_FLOAT_EQ(3.0f, GetImageScale(SCALE_FACTOR_300P));
+  EXPECT_FLOAT_EQ(1.0f, GetScaleForScaleFactor(SCALE_FACTOR_100P));
+  EXPECT_FLOAT_EQ(1.25f, GetScaleForScaleFactor(SCALE_FACTOR_125P));
+  EXPECT_FLOAT_EQ(1.33f, GetScaleForScaleFactor(SCALE_FACTOR_133P));
+  EXPECT_FLOAT_EQ(1.4f, GetScaleForScaleFactor(SCALE_FACTOR_140P));
+  EXPECT_FLOAT_EQ(1.5f, GetScaleForScaleFactor(SCALE_FACTOR_150P));
+  EXPECT_FLOAT_EQ(1.8f, GetScaleForScaleFactor(SCALE_FACTOR_180P));
+  EXPECT_FLOAT_EQ(2.0f, GetScaleForScaleFactor(SCALE_FACTOR_200P));
+  EXPECT_FLOAT_EQ(3.0f, GetScaleForScaleFactor(SCALE_FACTOR_300P));
 }
 
 TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
   std::vector<ScaleFactor> supported_factors;
   supported_factors.push_back(SCALE_FACTOR_100P);
   supported_factors.push_back(SCALE_FACTOR_180P);
   test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
   EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.1f));
   EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.9f));
   EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(1.0f));
@@ skipping 25 matching lines @@
   EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.89f));
   EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(1.91f));
   EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.0f));
   EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.1f));
   EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.0f));
   EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.1f));
   EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(999.0f));
 }
 
 }  // namespace ui