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

chrome/renderer/resources/extensions/omnibox_custom_bindings.js

 // 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.
 
 // Custom binding for the omnibox API. Only injected into the v8 contexts
 // for extensions which have permission for the omnibox API.
 
 var binding = require('binding').Binding.create('omnibox');
 
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
@@ skipping 72 matching lines @@
 
 binding.registerCustomHook(function(bindingsAPI) {
   var apiFunctions = bindingsAPI.apiFunctions;
 
   apiFunctions.setUpdateArgumentsPreValidate('setDefaultSuggestion',
                                              function(suggestResult) {
     if (suggestResult.content != undefined) {  // null, etc.
       throw new Error(
           'setDefaultSuggestion cannot contain the "content" field');
     }
-    suggestResult.content = '';
     return [suggestResult];
   });
 
   apiFunctions.setHandleRequest('setDefaultSuggestion', function(details) {
     var parseResult = parseOmniboxDescription(details.description);
     sendRequest(this.name, [parseResult], this.definition.parameters);
   });
 
   apiFunctions.setUpdateArgumentsPostValidate(
       'sendSuggestions', function(requestId, userSuggestions) {
@@ skipping 12 matching lines @@
     function(args, dispatch) {
   var text = args[0];
   var requestId = args[1];
   var suggestCallback = function(suggestions) {
     chrome.omnibox.sendSuggestions(requestId, suggestions);
   };
   dispatch([text, suggestCallback]);
 });
 
 exports.binding = binding.generate();