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

chrome/browser/extensions/api/omnibox/omnibox_api.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/api/omnibox/omnibox_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
@@ skipping 68 matching lines @@
                                            kOmniboxDefaultSuggestion,
                                            &dict)) {
     suggestion.reset(new omnibox::SuggestResult);
     omnibox::SuggestResult::Populate(*dict, suggestion.get());
   }
   return suggestion.Pass();
 }
 
 // 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());
 
   return true;
 }
 
 }  // namespace
 
 // static
@@ skipping 284 matching lines @@
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(description);
 }
 
 }  // namespace extensions