Refactored loading of applications / extensions icons.

chrome/browser/extensions/extension_icon_image_unittest.cc

Index: chrome/browser/extensions/extension_icon_image_unittest.cc
diff --git a/chrome/browser/extensions/extension_icon_image_unittest.cc b/chrome/browser/extensions/extension_icon_image_unittest.cc
index fd35ee9b4bf888cec87d485c12fe79afd5eb6e64..9fd30b5d3205847dfb058ab6a006acc36fe293c2 100644
--- a/chrome/browser/extensions/extension_icon_image_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_image_unittest.cc
@@ -73,9 +73,13 @@ class TestImageLoader {
   explicit TestImageLoader(const Extension* extension)
       : extension_(extension),
         waiting_(false),
-        image_loaded_(false) {
+        image_loaded_(false),
+        image_loader_(NULL) {
+  }
+
+  virtual ~TestImageLoader() {
+    delete image_loader_;
   }
-  virtual ~TestImageLoader() {}
 
   void OnImageLoaded(const gfx::Image& image) {
     image_ = image;
@@ -88,7 +92,8 @@ class TestImageLoader {
                       int size) {
     image_loaded_ = false;
 
-    image_loader_.LoadImageAsync(
+    image_loader_ = new extensions::ImageLoader(NULL);
+    image_loader_->LoadImageAsync(
         extension_, extension_->GetResource(path), gfx::Size(size, size),
         base::Bind(&TestImageLoader::OnImageLoaded,
                    base::Unretained(this)));
@@ -111,7 +116,7 @@ class TestImageLoader {
   bool waiting_;
   bool image_loaded_;
   gfx::Image image_;
-  extensions::ImageLoader image_loader_;
+  extensions::ImageLoader* image_loader_;

[Finnur, 2013/10/02 09:52:15]

nit: scoped_ptr<extensions::ImageLoader> image_loader_ would result in fewer
lines of code and less chance of accidental leak.

 
   DISALLOW_COPY_AND_ASSIGN(TestImageLoader);
 };