Generalize ExtensionIconSet to store icon paths for custom size sets

chrome/browser/extensions/extension_icon_manager.cc

Index: chrome/browser/extensions/extension_icon_manager.cc
diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc
index ac47e2fc04d3976cdacb40e7134f95cb6835e08e..fea156f9cf4cccfb66c1283786b1a1297b35c466 100644
--- a/chrome/browser/extensions/extension_icon_manager.cc
+++ b/chrome/browser/extensions/extension_icon_manager.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/theme_resources.h"
@@ -50,7 +51,7 @@ ExtensionIconManager::~ExtensionIconManager() {
 
 void ExtensionIconManager::LoadIcon(const extensions::Extension* extension) {
   ExtensionResource icon_resource = extension->GetIconResource(
-      ExtensionIconSet::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_BIGGER);
+      extension_misc::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_BIGGER);
   if (!icon_resource.extension_root().empty()) {
     // Insert into pending_icons_ first because LoadImage can call us back
     // synchronously if the image is already cached.