Remove dependency on ui::ScaleFactor from ui/gfx

ui/base/resource/resource_bundle_win.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/resource/resource_bundle_win.h"
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/layout.h"
@@ skipping 26 matching lines @@
 
 void ResourceBundle::LoadCommonResources() {
   // As a convenience, add the current resource module as a data packs.
   data_packs_.push_back(new ResourceDataDLL(GetCurrentResourceDLL()));
   // Have high-DPI resources for 140% and 180% scaling on Windows based on
   // default scaling for Metro mode. If high-DPI mode is enabled, load resource
   // pak closest to the desired scale factor.  The high-DPI resources are
   // scaled up from 100% touch.
   float scale = gfx::win::GetDeviceScaleFactor();
   bool force_touch_resources = false;
-  switch(ui::GetScaleFactorFromScale(scale)) {
+  switch(ui::GetSupportedScaleFactor(scale)) {
     case ui::SCALE_FACTOR_180P:
       AddDataPackFromPath(GetResourcesPakFilePath(
           "chrome_touch_180_percent.pak"),
           SCALE_FACTOR_180P);
       force_touch_resources = true;
       break;
     case ui::SCALE_FACTOR_140P:
       AddDataPackFromPath(GetResourcesPakFilePath(
           "chrome_touch_140_percent.pak"),
           SCALE_FACTOR_140P);
@@ skipping 23 matching lines @@
 
 void SetResourcesDataDLL(HINSTANCE handle) {
   resources_data_dll = handle;
 }
 
 HICON LoadThemeIconFromResourcesDataDLL(int icon_id) {
   return ::LoadIcon(GetCurrentResourceDLL(), MAKEINTRESOURCE(icon_id));
 }
 
 }  // namespace ui;