Move Icons out of Extension class

chrome/browser/extensions/extension_icon_image_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/test/test_browser_thread.h"
 #include "grit/theme_resources.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 195 matching lines @@
   SkBitmap bitmap_16 =
       GetTestBitmap(extension, "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, "48.png", 32);
   ASSERT_FALSE(bitmap_48_resized_to_32.empty());
 
-  IconImage image(extension, extension->icons(), 16, default_icon, this);
+  IconImage image(extension,
+                  extensions::IconsInfo::GetIcons(extension),
+                  16,
+                  default_icon,
+                  this);
 
   // No representations in |image_| yet.
   gfx::ImageSkia::ImageSkiaReps image_reps = image.image_skia().image_reps();
   ASSERT_EQ(0u, image_reps.size());
 
   // Gets representation for a scale factor.
   gfx::ImageSkiaRep representation =
       image.image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
 
   // Before the image representation is loaded, image should contain blank
@@ skipping 39 matching lines @@
   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, "48.png", 48);
   ASSERT_FALSE(bitmap_48.empty());
 
-  IconImage image(extension, extension->icons(), 32, default_icon, this);
+  IconImage image(extension,
+                  extensions::IconsInfo::GetIcons(extension),
+                  32,
+                  default_icon,
+                  this);
 
   gfx::ImageSkiaRep representation =
       image.image_skia().GetRepresentation(ui::SCALE_FACTOR_200P);
 
   WaitForImageLoad();
   EXPECT_EQ(1, ImageLoadedCount());
   ASSERT_EQ(1u, image.image_skia().image_reps().size());
 
   representation = image.image_skia().GetRepresentation(ui::SCALE_FACTOR_200P);
 
@@ skipping 14 matching lines @@
   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, "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
 
-  IconImage image(extension, extension->icons(), 17, default_icon, this);
+  IconImage image(extension,
+                  extensions::IconsInfo::GetIcons(extension),
+                  17,
+                  default_icon,
+                  this);
 
   gfx::ImageSkiaRep representation =
       image.image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
 
   WaitForImageLoad();
   EXPECT_EQ(1, ImageLoadedCount());
   ASSERT_EQ(1u, image.image_skia().image_reps().size());
 
   representation = image.image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
 
@@ skipping 153 matching lines @@
 
   gfx::ImageSkia default_icon = GetDefaultIcon();
 
   // Store the image in the cache.
   SkBitmap bitmap_16 =
       GetTestBitmap(extension, "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
   extension->SetCachedImage(extension->GetResource("16.png"), bitmap_16,
                             gfx::Size(16, 16));
 
-  IconImage image(extension, extension->icons(), 16, default_icon, this);
+  IconImage image(extension,
+                  extensions::IconsInfo::GetIcons(extension),
+                  16,
+                  default_icon,
+                  this);
 
   // No representations in |image_| yet.
   gfx::ImageSkia::ImageSkiaReps image_reps = image.image_skia().image_reps();
   ASSERT_EQ(0u, image_reps.size());
 
   // Gets representation for a scale factor.
   // Since the icon representation is precached, it should be returned right
   // away. Also, we should not receive any notifications.
   gfx::ImageSkiaRep representation =
       image.image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
@@ skipping 13 matching lines @@
   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, "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
 
-  scoped_ptr<IconImage> image(
-      new IconImage(extension, extension->icons(), 16, default_icon, this));
+  scoped_ptr<IconImage> image(new IconImage(
+      extension,
+      extensions::IconsInfo::GetIcons(extension),
+      16,
+      default_icon,
+      this));
 
   // Load an image representation.
   gfx::ImageSkiaRep representation =
       image->image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
 
   WaitForImageLoad();
   EXPECT_EQ(1, ImageLoadedCount());
   ASSERT_EQ(1u, image->image_skia().image_reps().size());
 
   // Stash loaded image skia, and destroy |image|.
   gfx::ImageSkia image_skia = image->image_skia();
   image.reset();
   extension = NULL;
 
   // Image skia should still be able to get previously loaded representation.
   representation = image_skia.GetRepresentation(ui::SCALE_FACTOR_100P);
 
   EXPECT_EQ(ui::SCALE_FACTOR_100P, representation.scale_factor());
   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(ui::SCALE_FACTOR_200P);
 
   EXPECT_TRUE(gfx::BitmapsAreEqual(
       representation.sk_bitmap(),
       CreateBlankBitmapForScale(16, ui::SCALE_FACTOR_200P)));
 }