[Extensions Bindings] Fix content settings validation

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;
 
 // Some content types have been removed and no longer correspond to a real
@@ skipping 29 matching lines @@
       $Function.apply(callback, undefined, [{setting: dummySetting}]);
       return;
     }
 
     return sendRequest('contentSettings.get',
                        [contentType, details, callback],
                        extendSchema(getSchema));
   };
 
   this.set = function(details, callback) {
+    // We check if the setting is deprecated first, since the validation will
+    // fail for deprecated types.
+    if ($Object.hasOwnProperty(DEPRECATED_CONTENT_TYPES, contentType)) {
+      console.warn('contentSettings.' + contentType + ' is deprecated; setting '
+                   + 'it has no effect.');
+      $Function.apply(callback, undefined, []);
+      return;
+    }
+
     // 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 = getFunctionParameters('set');
     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);

[Devlin, 2017/05/26 01:36:01]

This was validating only against the raw schema, which was "any".  I introduced
this back in
https://codereview.chromium.org/1906593002/diff/120001/chrome/renderer/resour....
:(

This works now, and the test in the JS exercises this path.

-
-    if ($Object.hasOwnProperty(DEPRECATED_CONTENT_TYPES, contentType)) {
-      console.warn('contentSettings.' + contentType + ' is deprecated; setting '
-                   + 'it has no effect.');
-      $Function.apply(callback, undefined, []);
-      return;
-    }
+    validate([details, callback], modSetSchema);
 
     return sendRequest('contentSettings.set',
                        [contentType, details, callback],
                        extendSchema(modSetSchema));
   };
 
   this.clear = function(details, callback) {
     var clearSchema = getFunctionParameters('clear');
     validate([details, callback], clearSchema);
 
@@ skipping 19 matching lines @@
     }
 
     return sendRequest(
         'contentSettings.getResourceIdentifiers',
         [contentType, callback],
         extendSchema(schema));
   };
 }
 
 exports.$set('ContentSetting', ContentSetting);