Makes ImageSkia more like SkBitmap

chrome/browser/extensions/image_loading_tracker.cc

Index: chrome/browser/extensions/image_loading_tracker.cc
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index 3bbf4334e5f92bb97ba9281c7123ec73530a5f8e..1a04f47af2e1d15f638451cae2db257c930faeb6 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -18,6 +18,7 @@
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 #include "webkit/glue/image_decoder.h"
 
 using content::BrowserThread;
@@ -303,13 +304,14 @@ void ImageLoadingTracker::OnImageLoaded(
     std::string extension_id = info->extension_id;
 
     if (info->bitmaps.size() > 0) {
-      std::vector<const SkBitmap*> bitmaps;
+      gfx::ImageSkia image_skia;
       for (std::vector<SkBitmap>::const_iterator it = info->bitmaps.begin();
            it != info->bitmaps.end(); ++it) {
         // gfx::Image takes ownership of this bitmap.
-        bitmaps.push_back(new SkBitmap(*it));
+        // TODO(pkotwicz): Do something better but ONLY when ENABLE_DIP.
+        image_skia.AddBitmapForScale(*it, 1.0f);
       }
-      image = gfx::Image(bitmaps);
+      image = gfx::Image(image_skia);
     }
 
     load_map_.erase(load_map_it);