Refactored loading of applications / extensions icons.

chrome/browser/extensions/extension_icon_image_unittest.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_image.h"
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/image_loader.h"
@@ skipping 55 matching lines @@
  private:
   gfx::ImageSkia image_;
 };
 
 // Helper class for synchronously loading extension image resource.
 class TestImageLoader {
  public:
   explicit TestImageLoader(const Extension* extension)
       : extension_(extension),
         waiting_(false),
-        image_loaded_(false) {
+        image_loaded_(false),
+        image_loader_(NULL) {
   }
-  virtual ~TestImageLoader() {}
+
+  virtual ~TestImageLoader() {
+    delete image_loader_;
+  }
 
   void OnImageLoaded(const gfx::Image& image) {
     image_ = image;
     image_loaded_ = true;
     if (waiting_)
       base::MessageLoop::current()->Quit();
   }
 
   SkBitmap LoadBitmap(const std::string& path,
                       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)));
 
     // If |image_| still hasn't been loaded (i.e. it is being loaded
     // asynchronously), wait for it.
     if (!image_loaded_) {
       waiting_ = true;
       base::MessageLoop::current()->Run();
       waiting_ = false;
     }
 
     EXPECT_TRUE(image_loaded_);
 
     return image_.IsEmpty() ? SkBitmap() : *image_.ToSkBitmap();
   }
 
  private:
   const Extension* extension_;
   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);
 };
 
 class ExtensionIconImageTest : public testing::Test,
                                public IconImage::Observer {
  public:
   ExtensionIconImageTest()
       : image_loaded_count_(0),
         quit_in_image_loaded_(false),
@@ skipping 438 matching lines @@
   EXPECT_EQ(16, representation.pixel_width());
   EXPECT_TRUE(gfx::BitmapsAreEqual(representation.sk_bitmap(), bitmap_16));
 
   // When requesting another representation, we should get blank image.
   representation = image_skia.GetRepresentation(2.0f);
 
   EXPECT_TRUE(gfx::BitmapsAreEqual(
       representation.sk_bitmap(),
       CreateBlankBitmapForScale(16, ui::SCALE_FACTOR_200P)));
 }