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

chrome/browser/search_engines/template_url_service.cc

Index: chrome/browser/search_engines/template_url_service.cc
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index dacbf3002f6e04f217140a5db613fd2afcc811bd..5bb35c59c59576f59f13c94ded34618e5cd6ee51 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -17,6 +17,7 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/google/google_url_tracker.h"
@@ -538,7 +539,7 @@ void TemplateURLService::RemoveAutoGeneratedForOriginBetween(
 void TemplateURLService::RegisterExtensionKeyword(
     const extensions::Extension* extension) {
   // TODO(mpcomplete): disable the keyword when the extension is disabled.
-  if (extension->omnibox_keyword().empty())
+  if (extensions::OmniboxAPI::GetKeyword(extension).empty())
     return;
 
   Load();
@@ -550,7 +551,7 @@ void TemplateURLService::RegisterExtensionKeyword(
   if (!GetTemplateURLForExtension(extension)) {
     TemplateURLData data;
     data.short_name = UTF8ToUTF16(extension->name());
-    data.SetKeyword(UTF8ToUTF16(extension->omnibox_keyword()));
+    data.SetKeyword(UTF8ToUTF16(extensions::OmniboxAPI::GetKeyword(extension)));
     // This URL is not actually used for navigation. It holds the extension's
     // ID, as well as forcing the TemplateURL to be treated as a search keyword.
     data.SetURL(std::string(extensions::kExtensionScheme) + "://" +