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

chrome/browser/ui/webui/options/search_engine_manager_handler.cc

Index: chrome/browser/ui/webui/options/search_engine_manager_handler.cc
diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
index 8821d61fc109b32e6936e0238e3812d90162bf5e..dc769d5b8e0a10f7a7d4eb4398c73bca98b9cbd6 100644
--- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
@@ -8,6 +8,7 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ -144,7 +145,7 @@ void SearchEngineManagerHandler::OnModelChanged() {
     const ExtensionSet* extensions = extension_service->extensions();
     for (ExtensionSet::const_iterator it = extensions->begin();
          it != extensions->end(); ++it) {
-      if ((*it)->omnibox_keyword().size() > 0)
+      if (extensions::OmniboxAPI::GetKeyword(*it).size() > 0)
         keyword_list.Append(CreateDictionaryForExtension(*(*it)));
     }
   }
@@ -170,7 +171,8 @@ base::DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForExtension(
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetString("name",  extension.name());
   dict->SetString("displayName", extension.name());
-  dict->SetString("keyword", extension.omnibox_keyword());
+  dict->SetString("keyword",
+                  extensions::OmniboxAPI::GetKeyword(&extension));
   GURL icon = extension.GetIconURL(16, ExtensionIconSet::MATCH_BIGGER);
   dict->SetString("iconURL", icon.spec());
   dict->SetString("url", string16());