Index: chrome/renderer/resources/extensions/binding.js |
diff --git a/chrome/renderer/resources/extensions/binding.js b/chrome/renderer/resources/extensions/binding.js |
index 68f52f981a4d26aa97a7fdd737c571dfb142b7a8..62d614407ba66fd7fa4eab7e85500721ff574409 100644 |
--- a/chrome/renderer/resources/extensions/binding.js |
+++ b/chrome/renderer/resources/extensions/binding.js |
@@ -2,10 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-require('json_schema'); |
-require('event_bindings'); |
var chrome = requireNative('chrome').GetChrome(); |
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden(); |
+var Event = require('event_bindings').Event; |
var forEach = require('utils').forEach; |
var GetAvailability = requireNative('v8_context').GetAvailability; |
var logging = requireNative('logging'); |
@@ -293,9 +291,8 @@ Binding.prototype = { |
// TODO(aa): It would be best to run this in a unit test, but in order |
// to do that we would need to better factor this code so that it |
// doesn't depend on so much v8::Extension machinery. |
- if (chromeHidden.validateAPI && |
- schemaUtils.isFunctionSignatureAmbiguous( |
- apiFunction.definition)) { |
+ if (logging.DCHECK_IS_ON() && |
+ schemaUtils.isFunctionSignatureAmbiguous(apiFunction.definition)) { |
throw new Error( |
apiFunction.name + ' has ambiguous optional arguments. ' + |
'To implement custom disambiguation logic, add ' + |
@@ -328,9 +325,8 @@ Binding.prototype = { |
} |
sendRequestHandler.clearCalledSendRequest(); |
- // Validate return value if defined - only in debug. |
- if (chromeHidden.validateCallbacks && |
- this.definition.returns) { |
+ // Validate return value if in sanity check mode. |
+ if (logging.DCHECK_IS_ON() && this.definition.returns) { |
schemaUtils.validate([retval], [this.definition.returns]); |
} |
return retval; |
@@ -363,9 +359,9 @@ Binding.prototype = { |
eventName, eventDef.parameters, eventDef.extraParameters, |
options); |
} else if (eventDef.anonymous) { |
- mod[eventDef.name] = new chrome.Event(); |
+ mod[eventDef.name] = new Event(); |
} else { |
- mod[eventDef.name] = new chrome.Event( |
+ mod[eventDef.name] = new Event( |
eventName, eventDef.parameters, options); |
} |
}, this); |