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

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

Issue 1003283002: Enable chrome.automation.getDesktop on all aura platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 var assertEq = chrome.test.assertEq; 5 var assertEq = chrome.test.assertEq;
6 var assertFalse = chrome.test.assertFalse; 6 var assertFalse = chrome.test.assertFalse;
7 var assertTrue = chrome.test.assertTrue; 7 var assertTrue = chrome.test.assertTrue;
8 8
9 var EventType = chrome.automation.EventType; 9 var EventType = chrome.automation.EventType;
10 var RoleType = chrome.automation.RoleType; 10 var RoleType = chrome.automation.RoleType;
(...skipping 24 matching lines...) Expand all
35 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo) { 35 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo) {
36 if (tabId == tab.id && changeInfo.status == 'complete') { 36 if (tabId == tab.id && changeInfo.status == 'complete') {
37 callback(); 37 callback();
38 } 38 }
39 }); 39 });
40 }); 40 });
41 } 41 }
42 42
43 function setupAndRunTests(allTests, opt_docString) { 43 function setupAndRunTests(allTests, opt_docString) {
44 function runTestInternal() { 44 function runTestInternal() {
45 chrome.automation.getDesktop(function(rootNodeArg) { 45 chrome.test.runTests(allTests);
46 rootNode = rootNodeArg;
47 chrome.test.runTests(allTests);
48 });
49 } 46 }
50 47
51 if (opt_docString) 48 chrome.automation.getDesktop(function(rootNodeArg) {
52 runWithDocument(opt_docString, runTestInternal); 49 rootNode = rootNodeArg;
53 else 50 if (opt_docString)
54 runTestInternal(); 51 runWithDocument(opt_docString, runTestInternal);
52 else
53 runTestInternal();
54 });
55 } 55 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698