Move Icons out of Extension class

chrome/common/extensions/extension_file_util.cc

Index: chrome/common/extensions/extension_file_util.cc
diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index 59f8b35f4face2ae784f4b8a30459b2c7154cb76..54bbad6724d019c7fe38d5e4e874daede13fe94b 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/chrome/common/extensions/extension_file_util.cc
@@ -20,6 +20,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ -247,8 +248,8 @@ bool ValidateExtension(const Extension* extension,
                        Extension::InstallWarningVector* warnings) {
   // Validate icons exist.
   for (ExtensionIconSet::IconMap::const_iterator iter =
-           extension->icons().map().begin();
-       iter != extension->icons().map().end();
+           extensions::IconsInfo::GetIcons(extension).map().begin();
+       iter != extensions::IconsInfo::GetIcons(extension).map().end();
        ++iter) {
     const FilePath path = extension->GetResource(iter->second).GetFilePath();
     if (!ValidateFilePath(path)) {