Modified Omnibox extension api to use JSON Schema Compiler

chrome/browser/extensions/extension_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_prefs.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_notifier.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
@@ skipping 1132 matching lines @@
       continue;
     bool writable = false;
     if (!file_entry->GetBoolean(kFileEntryWritable, &writable))
       continue;
     base::FilePath file_path(path_string);
     out->push_back(app_file_handler_util::SavedFileEntry(
         it.key(), file_path, writable));
   }
 }
 
-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());
 }
 
 bool ExtensionPrefs::IsIncognitoEnabled(const std::string& extension_id) {
   return ReadExtensionPrefBoolean(extension_id, kPrefIncognitoEnabled);
 }
 
 void ExtensionPrefs::SetIsIncognitoEnabled(const std::string& extension_id,
                                            bool enabled) {
   UpdateExtensionPref(extension_id, kPrefIncognitoEnabled,
@@ skipping 1193 matching lines @@
     is_enabled = initial_state == Extension::ENABLED;
   }
 
   extension_pref_value_map_->RegisterExtension(extension_id, install_time,
                                                is_enabled);
   content_settings_store_->RegisterExtension(extension_id, install_time,
                                              is_enabled);
 }
 
 }  // namespace extensions