Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 415 matching lines @@
   NetworkInfoDictionary(const FavoriteState* network,
                         ui::ScaleFactor icon_scale_factor);
 
   // Builds the DictionaryValue representation from the previously set
   // parameters. Ownership of the returned pointer is transferred to the caller.
   base::DictionaryValue* BuildDictionary();
 
  private:
   void SetIcon(const gfx::ImageSkia& icon,
                ui::ScaleFactor icon_scale_factor) {
-    gfx::ImageSkiaRep image_rep = icon.GetRepresentation(icon_scale_factor);
+    gfx::ImageSkiaRep image_rep
+        = icon.GetRepresentation(ui::GetImageScale(icon_scale_factor));
     icon_url_ = icon.isNull() ? "" : webui::GetBitmapDataUrl(
         image_rep.sk_bitmap());
   }
 
   std::string service_path_;
   std::string icon_url_;
   std::string name_;
   bool connecting_;
   bool connected_;
   bool connectable_;
@@ skipping 827 matching lines @@
 
 void InternetOptionsHandler::RefreshNetworksCallback(
     const base::ListValue* args) {
   NetworkHandler::Get()->network_state_handler()->RequestScan();
 }
 
 std::string InternetOptionsHandler::GetIconDataUrl(int resource_id) const {
   gfx::ImageSkia* icon =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
   gfx::ImageSkiaRep image_rep = icon->GetRepresentation(
-      web_ui()->GetDeviceScaleFactor());
+      ui::GetImageScale(web_ui()->GetDeviceScaleFactor()));
   return webui::GetBitmapDataUrl(image_rep.sk_bitmap());
 }
 
 void InternetOptionsHandler::RefreshNetworkData() {
   base::DictionaryValue dictionary;
   FillNetworkInfo(&dictionary);
   web_ui()->CallJavascriptFunction(
       kRefreshNetworkDataFunction, dictionary);
 }
 
@@ skipping 780 matching lines @@
   dictionary->SetBoolean(
       kTagWimaxAvailable,
       handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
   dictionary->SetBoolean(
       kTagWimaxEnabled,
       handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
 }
 
 }  // namespace options
 }  // namespace chromeos