chrome/test/data/extensions/api_test/automation/tests/desktop/common.js - Issue 667713006: Implement automatic load of composed/embedded automation trees

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/data/extensions/api_test/automation/tests/desktop/common.js

Issue 667713006: Implement automatic load of composed/embedded automation trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: Fix UAF Created 6 years, 1 month 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

« no previous file with comments | « chrome/renderer/resources/extensions/automation_custom_bindings.js ('k') | chrome/test/data/extensions/api_test/automation/tests/desktop/load_tabs.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/data/extensions/api_test/automation/tests/desktop/common.js

diff --git a/chrome/test/data/extensions/api_test/automation/tests/desktop/common.js b/chrome/test/data/extensions/api_test/automation/tests/desktop/common.js

index 61d5a6b42e17d866564c1e93659ebab7c7558897..65c79d6a7165f155ec5c9fa30f0c4d39cc400673 100644

--- a/chrome/test/data/extensions/api_test/automation/tests/desktop/common.js

+++ b/chrome/test/data/extensions/api_test/automation/tests/desktop/common.js

@@ -25,9 +25,31 @@ function findAutomationNode(root, condition) {

return null;

}

-function setupAndRunTests(allTests) {

- chrome.automation.getDesktop(function(rootNodeArg) {

- rootNode = rootNodeArg;

- chrome.test.runTests(allTests);

+function runWithDocument(docString, callback) {

+ var url = 'data:text/html,<!doctype html>' + docString;

+ var createParams = {

+ active: true,

+ url: url

+ };

+ chrome.tabs.create(createParams, function(tab) {

+ chrome.tabs.onUpdated.addListener(function(tabId, changeInfo) {

+ if (tabId == tab.id && changeInfo.status == 'complete') {

+ callback();

+ }

+ });

});

}

+function setupAndRunTests(allTests, opt_docString) {

+ function runTestInternal() {

+ chrome.automation.getDesktop(function(rootNodeArg) {

+ rootNode = rootNodeArg;

+ chrome.test.runTests(allTests);

+ });

+ }

+ if (opt_docString)

+ runWithDocument(opt_docString, runTestInternal);

+ else

+ runTestInternal();