SupportsUserData and manifest handlers for Extension; use them for the Omnibox API.

chrome/browser/extensions/extension_service.h

Index: chrome/browser/extensions/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 6e2d1b7d7aa307a38beb88821e336d90c50454bc..fe753931f0455f06a7076d4cbf260ab2e9ee1a19 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -426,13 +426,6 @@ class ExtensionService
   // tab. In this case, |url| is also rewritten to an error URL.
   bool ShouldBlockUrlInBrowserTab(GURL* url);
 
-  // Returns the icon to display in the omnibox for the given extension.
-  gfx::Image GetOmniboxIcon(const std::string& extension_id);
-
-  // Returns the icon to display in the omnibox popup window for the given
-  // extension.
-  gfx::Image GetOmniboxPopupIcon(const std::string& extension_id);
-
   // Called when the initial extensions load has completed.
   virtual void OnLoadedInstalledExtensions();
 
@@ -951,10 +944,6 @@ class ExtensionService
   // Keeps track of app notifications.
   scoped_refptr<extensions::AppNotificationManager> app_notification_manager_;
 
-  // Keeps track of favicon-sized omnibox icons for extensions.
-  ExtensionIconManager omnibox_icon_manager_;
-  ExtensionIconManager omnibox_popup_icon_manager_;
-
   // Flag to make sure event routers are only initialized once.
   bool event_routers_initialized_;