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

chrome/browser/extensions/api/omnibox/omnibox_api_factory.h

Index: chrome/browser/extensions/api/omnibox/omnibox_api_factory.h
diff --git a/chrome/browser/extensions/api/cookies/cookies_api_factory.h b/chrome/browser/extensions/api/omnibox/omnibox_api_factory.h
similarity index 54%
copy from chrome/browser/extensions/api/cookies/cookies_api_factory.h
copy to chrome/browser/extensions/api/omnibox/omnibox_api_factory.h
index a3c3a96385fc3ba672d0b25c67ee0d6e16e96cdb..a2958f26c3bb0441a387b3f242d4b3235f968e7e 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api_factory.h
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api_factory.h
@@ -2,32 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_API_COOKIES_COOKIES_API_FACTORY_H_
-#define CHROME_BROWSER_EXTENSIONS_API_COOKIES_COOKIES_API_FACTORY_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_FACTORY_H_
+#define CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_FACTORY_H_
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 namespace extensions {
-class CookiesAPI;
 
-class CookiesAPIFactory : public ProfileKeyedServiceFactory {
+class OmniboxAPI;
+
+class OmniboxAPIFactory : public ProfileKeyedServiceFactory {
  public:
-  static CookiesAPIFactory* GetInstance();
+  static OmniboxAPI* GetForProfile(Profile* profile);
+  static OmniboxAPIFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<CookiesAPIFactory>;
+  friend struct DefaultSingletonTraits<OmniboxAPIFactory>;
 
-  CookiesAPIFactory();
-  virtual ~CookiesAPIFactory();
+  OmniboxAPIFactory();
+  virtual ~OmniboxAPIFactory();
 
   // ProfileKeyedServiceFactory implementation.
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
   virtual bool ServiceIsCreatedWithProfile() const OVERRIDE;
-  virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
 };
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_API_COOKIES_COOKIES_API_FACTORY_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_FACTORY_H_