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 02b405e56264fe915ddce2addf416f70790d0211..b1dd582958f3945444792eac22efcb1c841cddba 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -1157,21 +1157,23 @@ void ExtensionPrefs::GetSavedFileEntries(
   }
 }
 
-ExtensionOmniboxSuggestion
+scoped_ptr<api::omnibox::SuggestDefaultResult>
 ExtensionPrefs::GetOmniboxDefaultSuggestion(const std::string& extension_id) {
-  ExtensionOmniboxSuggestion suggestion;
+  scoped_ptr<api::omnibox::SuggestDefaultResult> suggestion(0);

[not at google - send to devlin, 2013/03/16 00:04:25]

use NULL not 0, but besides scoped_ptrs are already initialized to null, so
argument not needed.

[Aaron Jacobs, 2013/03/21 21:59:55]

Done.

 
   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::SuggestDefaultResult);
+    api::omnibox::SuggestDefaultResult::Populate(*dict, suggestion.get());
+  }
 
-  return suggestion;
+  return suggestion.Pass();
 }
 
 void ExtensionPrefs::SetOmniboxDefaultSuggestion(
     const std::string& extension_id,
-    const ExtensionOmniboxSuggestion& suggestion) {
+    const api::omnibox::SuggestDefaultResult& suggestion) {
   scoped_ptr<base::DictionaryValue> dict = suggestion.ToValue().Pass();

[not at google - send to devlin, 2013/03/16 00:04:25]

not sure if Pass is necessary here, rvalues on scoped_ptrs don't need it.

[Aaron Jacobs, 2013/03/21 21:59:55]

Done.

   UpdateExtensionPref(extension_id, kOmniboxDefaultSuggestion, dict.release());
 }