Move Icons out of Extension class

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 29a09e0343b200f956c3b6688161e2eb90fccc02..36ceedbd61225e6f00236d55ca068d6eacc29170 100644
--- a/chrome/browser/extensions/extension_icon_image_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_image_unittest.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -9,6 +9,7 @@
 #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"
@@ -224,7 +225,11 @@ TEST_F(ExtensionIconImageTest, Basic) {
       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();
@@ -284,7 +289,11 @@ TEST_F(ExtensionIconImageTest, FallbackToSmallerWhenNoBigger) {
       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);
@@ -319,7 +328,11 @@ TEST_F(ExtensionIconImageTest, FallbackToSmaller) {
       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);
@@ -493,7 +506,11 @@ TEST_F(ExtensionIconImageTest, LoadPrecachedImage) {
   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();
@@ -527,8 +544,12 @@ TEST_F(ExtensionIconImageTest, IconImageDestruction) {
       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 =