[Extensions] Finish freezing schema

chrome/renderer/resources/extensions/content_setting.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 contentSettings API.
 
 var sendRequest = require('sendRequest').sendRequest;
 var validate = require('schemaUtils').validate;
 
 function extendSchema(schema) {
+/*  var extendedSchema = [{'type': 'string'}];
+  $Array.forEach(schema, function(s) {
+    extendedSchema.push(s);
+  });*/
   var extendedSchema = $Array.slice(schema);
   extendedSchema.unshift({'type': 'string'});
   return extendedSchema;
 }
 
 function ContentSetting(contentType, settingSchema) {
   this.get = function(details, callback) {
     var getSchema = this.functionSchemas.get.definition.parameters;
     validate([details, callback], getSchema);
     return sendRequest('contentSettings.get',
                        [contentType, details, callback],
                        extendSchema(getSchema));
   };
   this.set = function(details, callback) {
-    var setSchema = $Array.slice(
-        this.functionSchemas.set.definition.parameters);
-    setSchema[0].properties.setting = settingSchema;
-    validate([details, callback], setSchema);
+    // The set schema included in the Schema object is generic, since it varies
+    // per-setting. However, this is only ever for a single setting, so we can
+    // enforce the types more thoroughly.
+    var rawSetSchema = this.functionSchemas.set.definition.parameters;
+    var rawSettingParam = rawSetSchema[0];
+    var props = $Object.assign({}, rawSettingParam.properties);
+    props.setting = settingSchema;
+    var modSettingParam = {
+      name: rawSettingParam.name,
+      type: rawSettingParam.type,
+      properties: props,
+    };
+    var modSetSchema = $Array.slice(rawSetSchema);
+    modSetSchema[0] = modSettingParam;
+    validate([details, callback], rawSetSchema);
     return sendRequest('contentSettings.set',
                        [contentType, details, callback],
-                       extendSchema(setSchema));
+                       extendSchema(modSetSchema));
   };
   this.clear = function(details, callback) {
     var clearSchema = this.functionSchemas.clear.definition.parameters;
     validate([details, callback], clearSchema);
     return sendRequest('contentSettings.clear',
                        [contentType, details, callback],
                        extendSchema(clearSchema));
   };
   this.getResourceIdentifiers = function(callback) {
     var schema =
         this.functionSchemas.getResourceIdentifiers.definition.parameters;
     validate([callback], schema);
     return sendRequest(
         'contentSettings.getResourceIdentifiers',
         [contentType, callback],
         extendSchema(schema));
   };
 }
 
 exports.$set('ContentSetting', ContentSetting);