Modified Omnibox extension api to use JSON Schema Compiler

chrome/browser/extensions/extension_prefs.cc

Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 58f5e8928633c16dc6274653acf361c404edadb4..4859538ebd556377442bc1a7ed1b4c4775de35c4 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -1150,22 +1150,26 @@ void ExtensionPrefs::GetSavedFileEntries(
   }
 }
 
-ExtensionOmniboxSuggestion
+scoped_ptr<api::omnibox::SuggestResult>
 ExtensionPrefs::GetOmniboxDefaultSuggestion(const std::string& extension_id) {
-  ExtensionOmniboxSuggestion suggestion;
+  scoped_ptr<api::omnibox::SuggestResult> suggestion;
 
   const DictionaryValue* extension = GetExtensionPref(extension_id);
   const DictionaryValue* dict = NULL;
-  if (extension && extension->GetDictionary(kOmniboxDefaultSuggestion, &dict))
-    suggestion.Populate(*dict, false);
+  if (extension && extension->GetDictionary(kOmniboxDefaultSuggestion, &dict)) {
+    suggestion.reset(new api::omnibox::SuggestResult);
+    api::omnibox::SuggestResult::Populate(*dict, suggestion.get());
+  }
 
-  return suggestion;
+  return suggestion.Pass();
 }
 
 void ExtensionPrefs::SetOmniboxDefaultSuggestion(
     const std::string& extension_id,
-    const ExtensionOmniboxSuggestion& suggestion) {
-  scoped_ptr<base::DictionaryValue> dict = suggestion.ToValue().Pass();
+    const api::omnibox::SuggestResult& suggestion) {
+  scoped_ptr<base::DictionaryValue> dict = suggestion.ToValue();
+  // A default suggestion should not have the content field set.
+  dict->Remove("content", NULL);
   UpdateExtensionPref(extension_id, kOmniboxDefaultSuggestion, dict.release());
 }