Change browser/page action default icon defined in manifest to support hidpi.

ui/gfx/image/image_skia_operations.cc

Index: ui/gfx/image/image_skia_operations.cc
diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc
index c47b89b14d764b7d5c58783c69ff98ac66d1c7ec..860633491860de50dff2babebc414413318319ea 100644
--- a/ui/gfx/image/image_skia_operations.cc
+++ b/ui/gfx/image/image_skia_operations.cc
@@ -105,6 +105,7 @@ class SuperimposedImageSource : public gfx::CanvasImageSource {
   // gfx::CanvasImageSource override.
   virtual void Draw(Canvas* canvas) OVERRIDE {
     canvas->DrawImageInt(first_, 0, 0);
+LOG(ERROR) << second_.width();
     canvas->DrawImageInt(second_,
                          (first_.width() - second_.width()) / 2,
                          (first_.height() - second_.height()) / 2);
@@ -131,15 +132,14 @@ class TransparentImageSource : public gfx::ImageSkiaSource {
   virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
     ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
     SkBitmap alpha;
-    const float scale = ui::GetScaleFactorScale(image_rep.scale_factor());
     alpha.setConfig(SkBitmap::kARGB_8888_Config,
-                    static_cast<int>(image_.size().width() * scale),
-                    static_cast<int>(image_.size().height() * scale));
+                    static_cast<int>(image_rep.sk_bitmap().width()),
+                    static_cast<int>(image_rep.sk_bitmap().height()));
     alpha.allocPixels();
     alpha.eraseColor(SkColorSetARGB(alpha_ * 256, 0, 0, 0));
-    return ImageSkiaRep(SkBitmapOperations::CreateMaskedBitmap(
-        image_rep.sk_bitmap(), alpha),
-                        image_rep.scale_factor());
+    return ImageSkiaRep(
+        SkBitmapOperations::CreateMaskedBitmap(image_rep.sk_bitmap(), alpha),
+        image_rep.scale_factor());
   }
 
   ImageSkia image_;