Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/chrome/browser/extensions/extension_icon_manager.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_manager.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/image_loader.h"
@@ skipping 14 matching lines @@
 
 namespace {
 
 // Helper function to create a new bitmap with |padding| amount of empty space
 // around the original bitmap.
 static SkBitmap ApplyPadding(const SkBitmap& source,
                              const gfx::Insets& padding) {
   scoped_ptr<gfx::Canvas> result(
       new gfx::Canvas(gfx::Size(source.width() + padding.width(),
                                 source.height() + padding.height()),
-                      1.0f,
+                      ui::SCALE_FACTOR_100P,
                       false));
   result->DrawImageInt(
       gfx::ImageSkia::CreateFrom1xBitmap(source),
       0, 0, source.width(), source.height(),
       padding.left(), padding.top(), source.width(), source.height(),
       false);
   return result->ExtractImageRep().sk_bitmap();
 }
 
 }  // namespace
@@ skipping 81 matching lines @@
   if (monochrome_) {
     color_utils::HSL shift = {-1, 0, 0.6};
     result = SkBitmapOperations::CreateHSLShiftedBitmap(result, shift);
   }
 
   if (!padding_.empty())
     result = ApplyPadding(result, padding_);
 
   return result;
 }