2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index ab43b06..3bbf4334e 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -18,7 +18,6 @@
 #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;
@@ -304,13 +303,13 @@ void ImageLoadingTracker::OnImageLoaded(
     std::string extension_id = info->extension_id;
 
     if (info->bitmaps.size() > 0) {
-      gfx::ImageSkia image_skia;
+      std::vector<const SkBitmap*> bitmaps;
       for (std::vector<SkBitmap>::const_iterator it = info->bitmaps.begin();
            it != info->bitmaps.end(); ++it) {
-        // TODO(pkotwicz): Do something better but ONLY when ENABLE_DIP.
-        image_skia.AddBitmapForScale(*it, 1.0f);
+        // gfx::Image takes ownership of this bitmap.
+        bitmaps.push_back(new SkBitmap(*it));
       }
-      image = gfx::Image(image_skia);
+      image = gfx::Image(bitmaps);
     }
 
     load_map_.erase(load_map_it);
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc
index edbbcee..4306936 100644
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc
+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc
@@ -218,10 +218,11 @@ TEST_F(ImageLoadingTrackerTest, MultipleImages) {
   EXPECT_EQ(1, image_loaded_count());
 
   // Check that all images were loaded.
-  const std::vector<SkBitmap> bitmaps = image_.ToImageSkia()->bitmaps();
+  const std::vector<const SkBitmap*>& bitmaps =
+      image_.ToImageSkia()->bitmaps();
   ASSERT_EQ(2u, bitmaps.size());
-  const SkBitmap* bmp1 = &bitmaps[0];
-  const SkBitmap* bmp2 = &bitmaps[1];
+  const SkBitmap* bmp1 = bitmaps[0];
+  const SkBitmap* bmp2 = bitmaps[1];
   if (bmp1->width() > bmp2->width()) {
     std::swap(bmp1, bmp2);
   }