Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

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/logging.h"
 #include "base/stl_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 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()),
-                      ui::SCALE_FACTOR_100P,
-                      false));
+                                source.height() + padding.height()), false));
   result->DrawImageInt(
       source,
       0, 0, source.width(), source.height(),
       padding.left(), padding.top(), source.width(), source.height(),
       false);
-  return result->ExtractImageRep().sk_bitmap();
+  return result->ExtractBitmap();
 }
 
 }  // namespace
 
 ExtensionIconManager::ExtensionIconManager()
     : ALLOW_THIS_IN_INITIALIZER_LIST(image_tracker_(this)),
       monochrome_(false) {
 }
 
 ExtensionIconManager::~ExtensionIconManager() {
@@ skipping 68 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;
 }