Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/ui/webui/chromeos/login/network_dropdown.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/chromeos/login/network_dropdown.h"
 
 #include <string>
 
 #include "ash/system/chromeos/network/network_icon.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
@@ skipping 72 matching lines @@
     if (type == ui::MenuModel::TYPE_SEPARATOR)
       id = -2;
     else
       id = model->GetCommandIdAt(i);
     base::DictionaryValue* item = new base::DictionaryValue();
     item->SetInteger("id", id);
     item->SetString("label", model->GetLabelAt(i));
     gfx::Image icon;
     if (model->GetIconAt(i, &icon)) {
       SkBitmap icon_bitmap = icon.ToImageSkia()->GetRepresentation(
-          web_ui_->GetDeviceScaleFactor()).sk_bitmap();
+          ui::GetImageScale(
+              web_ui_->GetDeviceScaleFactor())).sk_bitmap();
       item->SetString("icon", webui::GetBitmapDataUrl(icon_bitmap));
     }
     if (id >= 0) {
       item->SetBoolean("enabled", model->IsEnabledAt(i));
       const gfx::Font* font = model->GetLabelFontAt(i);
       if (font) {
         item->SetBoolean("bold", font->GetStyle() == gfx::Font::BOLD);
       }
     }
     if (type == ui::MenuModel::TYPE_SUBMENU)
@@ skipping 81 matching lines @@
   bool animating = false;
   ash::network_icon::GetDefaultNetworkImageAndLabel(
       ash::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating);
   if (animating) {
     ash::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
   } else {
     ash::network_icon::NetworkIconAnimation::GetInstance()->
         RemoveObserver(this);
   }
   SkBitmap icon_bitmap = icon_image.GetRepresentation(
-      web_ui_->GetDeviceScaleFactor()).sk_bitmap();
+      ui::GetImageScale(web_ui_->GetDeviceScaleFactor())).sk_bitmap();
   std::string icon_str;
   if (!icon_image.isNull())
     icon_str = webui::GetBitmapDataUrl(icon_bitmap);
   base::StringValue title(text);
   base::StringValue icon(icon_str);
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 void NetworkDropdown::RequestNetworkScan() {
   NetworkHandler::Get()->network_state_handler()->RequestScan();
   Refresh();
 }
 
 }  // namespace chromeos