Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7639)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/resources/extensions/apitest.js

Issue 11571014: Lazy load chrome.* APIs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments/TODOs Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/renderer/extensions/schema_generated_native_handler.cc ('K') | « chrome/renderer/extensions/v8_schema_registry.h ('k') | chrome/renderer/resources/extensions/app_custom_bindings.js » ('j') | chrome/renderer/resources/extensions/schema_binding_generator.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/resources/extensions/apitest.js
diff --git a/chrome/renderer/resources/extensions/apitest.js b/chrome/renderer/resources/extensions/apitest.js
index 6d8ea0ebb5ad363350e87a5ec7c6f16fd102734e..28e5e4321c39f98d5df97b3a544c96f035b48a91 100644
--- a/chrome/renderer/resources/extensions/apitest.js
+++ b/chrome/renderer/resources/extensions/apitest.js
@@ -5,9 +5,14 @@
// extension_apitest.js
// mini-framework for ExtensionApiTest browser tests
- chrome.test = chrome.test || {};
+var bindings = new (require('schema_binding_generator').Bindings)('test');
- chrome.test.tests = chrome.test.tests || [];
+var chrome = requireNative('chrome').GetChrome();
+
+bindings.registerCustomHook(function(api) {
+ chrome_test = api.compiledApi;
+
+ chrome_test.tests = chrome_test.tests || [];
var currentTest = null;
var lastTest = null;
@@ -24,14 +29,14 @@
function testDone() {
// Use setTimeout here to allow previous test contexts to be
// eligible for garbage collection.
- setTimeout(chrome.test.runNextTest, 0);
+ setTimeout(chrome_test.runNextTest, 0);
}
function allTestsDone() {
if (testsFailed == 0) {
- chrome.test.notifyPass();
+ chrome_test.notifyPass();
} else {
- chrome.test.notifyFail('Failed ' + testsFailed + ' of ' +
+ chrome_test.notifyFail('Failed ' + testsFailed + ' of ' +
testCount + ' tests');
}
@@ -42,24 +47,24 @@
var pendingCallbacks = 0;
- chrome.test.callbackAdded = function() {
+ chrome_test.callbackAdded = function() {
pendingCallbacks++;
return function() {
pendingCallbacks--;
if (pendingCallbacks == 0) {
- chrome.test.succeed();
+ chrome_test.succeed();
}
};
};
- chrome.test.runNextTest = function() {
+ chrome_test.runNextTest = function() {
// There may have been callbacks which were interrupted by failure
// exceptions.
pendingCallbacks = 0;
lastTest = currentTest;
- currentTest = chrome.test.tests.shift();
+ currentTest = chrome_test.tests.shift();
if (!currentTest) {
allTestsDone();
@@ -67,19 +72,19 @@
}
try {
- chrome.test.log("( RUN ) " + testName(currentTest));
+ chrome_test.log("( RUN ) " + testName(currentTest));
currentTest.call();
} catch (e) {
if (e !== failureException)
- chrome.test.fail('uncaught exception: ' + e);
+ chrome_test.fail('uncaught exception: ' + e);
}
};
- chrome.test.fail = function(message) {
- chrome.test.log("( FAILED ) " + testName(currentTest));
+ chrome_test.fail = function(message) {
+ chrome_test.log("( FAILED ) " + testName(currentTest));
var stack = {};
- Error.captureStackTrace(stack, chrome.test.fail);
+ Error.captureStackTrace(stack, chrome_test.fail);
if (!message)
message = "FAIL (no message)";
@@ -93,21 +98,21 @@
throw failureException;
};
- chrome.test.succeed = function() {
+ chrome_test.succeed = function() {
console.log("[SUCCESS] " + testName(currentTest));
- chrome.test.log("( SUCCESS )");
+ chrome_test.log("( SUCCESS )");
testDone();
};
- chrome.test.assertTrue = function(test, message) {
- chrome.test.assertBool(test, true, message);
+ chrome_test.assertTrue = function(test, message) {
+ chrome_test.assertBool(test, true, message);
};
- chrome.test.assertFalse = function(test, message) {
- chrome.test.assertBool(test, false, message);
+ chrome_test.assertFalse = function(test, message) {
+ chrome_test.assertBool(test, false, message);
};
- chrome.test.assertBool = function(test, expected, message) {
+ chrome_test.assertBool = function(test, expected, message) {
if (test !== expected) {
if (typeof(test) == "string") {
if (message)
@@ -115,11 +120,11 @@
else
message = test;
}
- chrome.test.fail(message);
+ chrome_test.fail(message);
}
};
- chrome.test.checkDeepEq = function (expected, actual) {
+ chrome_test.checkDeepEq = function (expected, actual) {
if ((expected === null) != (actual === null))
return false;
@@ -142,7 +147,7 @@
var eq = true;
switch (typeof(expected[p])) {
case 'object':
- eq = chrome.test.checkDeepEq(expected[p], actual[p]);
+ eq = chrome_test.checkDeepEq(expected[p], actual[p]);
break;
case 'function':
eq = (typeof(actual[p]) != 'undefined' &&
@@ -159,41 +164,41 @@
return true;
};
- chrome.test.assertEq = function(expected, actual, message) {
+ chrome_test.assertEq = function(expected, actual, message) {
var error_msg = "API Test Error in " + testName(currentTest);
if (message)
error_msg += ": " + message;
if (typeof(expected) == 'object') {
- if (!chrome.test.checkDeepEq(expected, actual)) {
- chrome.test.fail(error_msg +
+ if (!chrome_test.checkDeepEq(expected, actual)) {
+ chrome_test.fail(error_msg +
"\nActual: " + JSON.stringify(actual) +
"\nExpected: " + JSON.stringify(expected));
}
return;
}
if (expected != actual) {
- chrome.test.fail(error_msg +
+ chrome_test.fail(error_msg +
"\nActual: " + actual + "\nExpected: " + expected);
}
if (typeof(expected) != typeof(actual)) {
- chrome.test.fail(error_msg +
+ chrome_test.fail(error_msg +
" (type mismatch)\nActual Type: " + typeof(actual) +
"\nExpected Type:" + typeof(expected));
}
};
- chrome.test.assertNoLastError = function() {
+ chrome_test.assertNoLastError = function() {
if (chrome.runtime.lastError != undefined) {
- chrome.test.fail("lastError.message == " +
+ chrome_test.fail("lastError.message == " +
chrome.runtime.lastError.message);
}
};
- chrome.test.assertLastError = function(expectedError) {
- chrome.test.assertEq(typeof(expectedError), 'string');
- chrome.test.assertTrue(chrome.runtime.lastError != undefined,
+ chrome_test.assertLastError = function(expectedError) {
+ chrome_test.assertEq(typeof(expectedError), 'string');
+ chrome_test.assertTrue(chrome.runtime.lastError != undefined,
"No lastError, but expected " + expectedError);
- chrome.test.assertEq(expectedError, chrome.runtime.lastError.message);
+ chrome_test.assertEq(expectedError, chrome.runtime.lastError.message);
}
function safeFunctionApply(func, arguments) {
@@ -202,23 +207,23 @@
func.apply(null, arguments);
} catch (e) {
var msg = "uncaught exception " + e;
- chrome.test.fail(msg);
+ chrome_test.fail(msg);
}
};
// Wrapper for generating test functions, that takes care of calling
// assertNoLastError() and (optionally) succeed() for you.
- chrome.test.callback = function(func, expectedError) {
+ chrome_test.callback = function(func, expectedError) {
if (func) {
- chrome.test.assertEq(typeof(func), 'function');
+ chrome_test.assertEq(typeof(func), 'function');
}
- var callbackCompleted = chrome.test.callbackAdded();
+ var callbackCompleted = chrome_test.callbackAdded();
return function() {
if (expectedError == null) {
- chrome.test.assertNoLastError();
+ chrome_test.assertNoLastError();
} else {
- chrome.test.assertLastError(expectedError);
+ chrome_test.assertLastError(expectedError);
}
if (func) {
@@ -229,8 +234,8 @@
};
};
- chrome.test.listenOnce = function(event, func) {
- var callbackCompleted = chrome.test.callbackAdded();
+ chrome_test.listenOnce = function(event, func) {
+ var callbackCompleted = chrome_test.callbackAdded();
var listener = function() {
event.removeListener(listener);
safeFunctionApply(func, arguments);
@@ -239,8 +244,8 @@
event.addListener(listener);
};
- chrome.test.listenForever = function(event, func) {
- var callbackCompleted = chrome.test.callbackAdded();
+ chrome_test.listenForever = function(event, func) {
+ var callbackCompleted = chrome_test.callbackAdded();
var listener = function() {
safeFunctionApply(func, arguments);
@@ -255,16 +260,19 @@
return done;
};
- chrome.test.callbackPass = function(func) {
- return chrome.test.callback(func);
+ chrome_test.callbackPass = function(func) {
+ return chrome_test.callback(func);
};
- chrome.test.callbackFail = function(expectedError, func) {
- return chrome.test.callback(func, expectedError);
+ chrome_test.callbackFail = function(expectedError, func) {
+ return chrome_test.callback(func, expectedError);
};
- chrome.test.runTests = function(tests) {
- chrome.test.tests = tests;
- testCount = chrome.test.tests.length;
- chrome.test.runNextTest();
+ chrome_test.runTests = function(tests) {
+ chrome_test.tests = tests;
+ testCount = chrome_test.tests.length;
+ chrome_test.runNextTest();
};
+});
+
+exports.bindings = bindings.generate();
« chrome/renderer/extensions/schema_generated_native_handler.cc ('K') | « chrome/renderer/extensions/v8_schema_registry.h ('k') | chrome/renderer/resources/extensions/app_custom_bindings.js » ('j') | chrome/renderer/resources/extensions/schema_binding_generator.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698