Merge 199135 "Fix mismatched parameter expectations between chro..."

chrome/browser/extensions/api/omnibox/omnibox_api.cc

Index: chrome/browser/extensions/api/omnibox/omnibox_api.cc
===================================================================
--- chrome/browser/extensions/api/omnibox/omnibox_api.cc	(revision 199613)
+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc	(working copy)
@@ -86,17 +86,19 @@
 
 // Tries to set the omnibox default suggestion; returns true on success or
 // false on failure.
-bool SetOmniboxDefaultSuggestion(Profile* profile,
-                                 const std::string& extension_id,
-                                 const omnibox::SuggestResult& suggestion) {
+bool SetOmniboxDefaultSuggestion(
+    Profile* profile,
+    const std::string& extension_id,
+    const omnibox::DefaultSuggestResult& suggestion) {
   ExtensionPrefs* prefs =
       ExtensionSystem::Get(profile)->extension_service()->extension_prefs();
   if (!prefs)
     return false;
 
   scoped_ptr<base::DictionaryValue> dict = suggestion.ToValue();
-  // A default suggestion should not have the content field set.
-  dict->Remove(kSuggestionContent, NULL);
+  // Add the content field so that the dictionary can be used to populate an
+  // omnibox::SuggestResult.
+  dict->SetWithoutPathExpansion(kSuggestionContent, new base::StringValue(""));
   prefs->UpdateExtensionPref(extension_id,
                              kOmniboxDefaultSuggestion,
                              dict.release());