Index: extensions/renderer/resources/test_custom_bindings.js |
diff --git a/extensions/renderer/resources/test_custom_bindings.js b/extensions/renderer/resources/test_custom_bindings.js |
index 5fd45495247c5def8a319ef9895dd59d07155640..43af06fc3dc89c0a15c8674c7b41f70a04ae3758 100644 |
--- a/extensions/renderer/resources/test_custom_bindings.js |
+++ b/extensions/renderer/resources/test_custom_bindings.js |
@@ -7,16 +7,8 @@ |
var binding = require('binding').Binding.create('test'); |
-var chrome = requireNative('chrome').GetChrome(); |
-var GetExtensionAPIDefinitionsForTest = |
- requireNative('apiDefinitions').GetExtensionAPIDefinitionsForTest; |
-var GetAvailability = requireNative('v8_context').GetAvailability; |
-var GetAPIFeatures = requireNative('test_features').GetAPIFeatures; |
+var delegate = require('test_delegate'); |
raymes
2014/07/24 08:17:38
'test_environment_specific_bindings' (or anything
Sam McNally
2014/07/24 08:44:37
Done.
|
var uncaughtExceptionHandler = require('uncaught_exception_handler'); |
-var userGestures = requireNative('user_gestures'); |
- |
-var RunWithNativesEnabledModuleSystem = |
- requireNative('v8_context').RunWithNativesEnabledModuleSystem; |
binding.registerCustomHook(function(api) { |
var chromeTest = api.compiledApi; |
@@ -36,10 +28,14 @@ binding.registerCustomHook(function(api) { |
return test ? (test.name || test.generatedName) : "(no test)"; |
} |
+ function runTests(tests) { |
+ chromeTest.tests = tests; |
+ testCount = chromeTest.tests.length; |
+ chromeTest.runNextTest(); |
+ } |
+ |
function testDone() { |
- // Use setTimeout here to allow previous test contexts to be |
- // eligible for garbage collection. |
- setTimeout(chromeTest.runNextTest, 0); |
+ delegate.testDone(chromeTest.runNextTest); |
} |
function allTestsDone() { |
@@ -60,7 +56,7 @@ binding.registerCustomHook(function(api) { |
return function() { |
if (called != null) { |
var redundantPrefix = 'Error\n'; |
- chrome.test.fail( |
+ chromeTest.fail( |
'Callback has already been run. ' + |
'First call:\n' + |
$String.slice(called, redundantPrefix.length) + '\n' + |
@@ -125,10 +121,6 @@ binding.registerCustomHook(function(api) { |
testDone(); |
}); |
- apiFunctions.setHandleRequest('runWithModuleSystem', function(callback) { |
- RunWithNativesEnabledModuleSystem(callback); |
- }); |
- |
apiFunctions.setHandleRequest('assertTrue', function(test, message) { |
chromeTest.assertBool(test, true, message); |
}); |
@@ -323,38 +315,12 @@ binding.registerCustomHook(function(api) { |
return chromeTest.callback(func, expectedError); |
}); |
- apiFunctions.setHandleRequest('runTests', function(tests) { |
- chromeTest.tests = tests; |
- testCount = chromeTest.tests.length; |
- chromeTest.runNextTest(); |
- }); |
- |
- apiFunctions.setHandleRequest('getApiDefinitions', function() { |
- return GetExtensionAPIDefinitionsForTest(); |
- }); |
- |
- apiFunctions.setHandleRequest('getApiFeatures', function() { |
- return GetAPIFeatures(); |
- }); |
- |
- apiFunctions.setHandleRequest('isProcessingUserGesture', function() { |
- return userGestures.IsProcessingUserGesture(); |
- }); |
- |
- apiFunctions.setHandleRequest('runWithUserGesture', function(callback) { |
- chromeTest.assertEq(typeof(callback), 'function'); |
- return userGestures.RunWithUserGesture(callback); |
- }); |
- |
- apiFunctions.setHandleRequest('runWithoutUserGesture', function(callback) { |
- chromeTest.assertEq(typeof(callback), 'function'); |
- return userGestures.RunWithoutUserGesture(callback); |
- }); |
- |
apiFunctions.setHandleRequest('setExceptionHandler', function(callback) { |
chromeTest.assertEq(typeof(callback), 'function'); |
uncaughtExceptionHandler.setHandler(callback); |
}); |
+ |
+ delegate.registerHooks(api, runTests, testName); |
}); |
exports.binding = binding.generate(); |