Task manager's apps and extensions should show the correct favicon

extensions/browser/extension_icon_image_unittest.cc

 // Copyright 2014 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 "extensions/browser/extension_icon_image.h"
 
 #include <vector>
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/browser/extensions_test.h"
 #include "extensions/browser/image_loader.h"
+#include "extensions/browser/test_image_loader.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "skia/ext/image_operations.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/skia_util.h"
 
@@ skipping 31 matching lines @@
   ~MockImageSkiaSource() override {}
 
   gfx::ImageSkiaRep GetImageForScale(float scale) override {
     return image_.GetRepresentation(scale);
   }
 
  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) {
-  }
-  virtual ~TestImageLoader() {}
-
-  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(
-        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_;
-  ImageLoader image_loader_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestImageLoader);
-};
-
 class ExtensionIconImageTest : public ExtensionsTest,
                                public IconImage::Observer {
  public:
   ExtensionIconImageTest()
       : image_loaded_count_(0),
         quit_in_image_loaded_(false),
         ui_thread_(BrowserThread::UI, &ui_loop_),
         file_thread_(BrowserThread::FILE),
         io_thread_(BrowserThread::IO),
         notification_service_(content::NotificationService::Create()) {}
@@ skipping 50 matching lines @@
   void OnExtensionIconImageChanged(IconImage* image) override {
     image_loaded_count_++;
     if (quit_in_image_loaded_)
       base::MessageLoop::current()->Quit();
   }
 
   gfx::ImageSkia GetDefaultIcon() {
     return gfx::ImageSkia(gfx::ImageSkiaRep(gfx::Size(16, 16), 1.0f));
   }
 
-  // Loads an image to be used in test from the extension.
-  // The image will be loaded from the relative path |path|.
-  SkBitmap GetTestBitmap(const Extension* extension,
-                         const std::string& path,
-                         int size) {
-    TestImageLoader image_loader(extension);
-    return image_loader.LoadBitmap(path, size);
-  }
-
  private:
   int image_loaded_count_;
   bool quit_in_image_loaded_;
   base::MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
   scoped_ptr<content::NotificationService> notification_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionIconImageTest);
 };
 
 }  // namespace
 
 TEST_F(ExtensionIconImageTest, Basic) {
   std::vector<ui::ScaleFactor> supported_factors;
   supported_factors.push_back(ui::SCALE_FACTOR_100P);
   supported_factors.push_back(ui::SCALE_FACTOR_200P);
   ui::test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
   scoped_refptr<Extension> extension(CreateExtension(
       "extension_icon_image", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   gfx::ImageSkia default_icon = GetDefaultIcon();
 
   // Load images we expect to find as representations in icon_image, so we
   // can later use them to validate icon_image.
-  SkBitmap bitmap_16 = GetTestBitmap(extension.get(), "16.png", 16);
+  SkBitmap bitmap_16 =
+      TestImageLoader::LoadAndGetExtensionBitmap(extension.get(), "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
 
   // There is no image of size 32 defined in the extension manifest, so we
   // should expect manifest image of size 48 resized to size 32.
   SkBitmap bitmap_48_resized_to_32 =
-      GetTestBitmap(extension.get(), "48.png", 32);
+      TestImageLoader::LoadAndGetExtensionBitmap(extension.get(), "48.png", 32);
   ASSERT_FALSE(bitmap_48_resized_to_32.empty());
 
   IconImage image(browser_context(),
                   extension.get(),
                   IconsInfo::GetIcons(extension.get()),
                   16,
                   default_icon,
                   this);
 
   // No representations in |image_| yet.
@@ skipping 46 matching lines @@
   supported_factors.push_back(ui::SCALE_FACTOR_200P);
   ui::test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
   scoped_refptr<Extension> extension(CreateExtension(
       "extension_icon_image", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   gfx::ImageSkia default_icon = GetDefaultIcon();
 
   // Load images we expect to find as representations in icon_image, so we
   // can later use them to validate icon_image.
-  SkBitmap bitmap_48 = GetTestBitmap(extension.get(), "48.png", 48);
+  SkBitmap bitmap_48 =
+      TestImageLoader::LoadAndGetExtensionBitmap(extension.get(), "48.png", 48);
   ASSERT_FALSE(bitmap_48.empty());
 
   IconImage image(browser_context(),
                   extension.get(),
                   IconsInfo::GetIcons(extension.get()),
                   32,
                   default_icon,
                   this);
 
   gfx::ImageSkiaRep representation = image.image_skia().GetRepresentation(2.0f);
@@ skipping 16 matching lines @@
 // one. The bigger resource should be loaded.
 TEST_F(ExtensionIconImageTest, FallbackToBigger) {
   scoped_refptr<Extension> extension(CreateExtension(
       "extension_icon_image", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   gfx::ImageSkia default_icon = GetDefaultIcon();
 
   // Load images we expect to find as representations in icon_image, so we
   // can later use them to validate icon_image.
-  SkBitmap bitmap_24 = GetTestBitmap(extension.get(), "24.png", 24);
+  SkBitmap bitmap_24 =
+      TestImageLoader::LoadAndGetExtensionBitmap(extension.get(), "24.png", 24);
   ASSERT_FALSE(bitmap_24.empty());
 
   IconImage image(browser_context(),
                   extension.get(),
                   IconsInfo::GetIcons(extension.get()),
                   17,
                   default_icon,
                   this);
 
   gfx::ImageSkiaRep representation = image.image_skia().GetRepresentation(1.0f);
@@ skipping 171 matching lines @@
 // representations should be returned.
 TEST_F(ExtensionIconImageTest, IconImageDestruction) {
   scoped_refptr<Extension> extension(CreateExtension(
       "extension_icon_image", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   gfx::ImageSkia default_icon = GetDefaultIcon();
 
   // Load images we expect to find as representations in icon_image, so we
   // can later use them to validate icon_image.
-  SkBitmap bitmap_16 = GetTestBitmap(extension.get(), "16.png", 16);
+  SkBitmap bitmap_16 =
+      TestImageLoader::LoadAndGetExtensionBitmap(extension.get(), "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
 
   scoped_ptr<IconImage> image(
       new IconImage(browser_context(),
                     extension.get(),
                     IconsInfo::GetIcons(extension.get()),
                     16,
                     default_icon,
                     this));
 
@@ skipping 61 matching lines @@
   // because image storage is shared, so when we created one from the first
   // image, all other images should also have that representation...
   gfx::Image image2 = icon_image->image();
   EXPECT_EQ(image_as_png.get(), image2.As1xPNGBytes().get());
 
   // ...even images that were copied before the representation was constructed.
   EXPECT_EQ(image_as_png.get(), prior_image.As1xPNGBytes().get());
 }
 
 }  // namespace extensions