| Index: chrome/test/data/extensions/api_test/processes/api/test.js
|
| diff --git a/chrome/test/data/extensions/api_test/processes/api/test.js b/chrome/test/data/extensions/api_test/processes/api/test.js
|
| index 27b3f0dfecf0d1c889914efaeccc47df388bd829..32f8804f7a48a01b6fef14d93d667ff17ea9d6f0 100644
|
| --- a/chrome/test/data/extensions/api_test/processes/api/test.js
|
| +++ b/chrome/test/data/extensions/api_test/processes/api/test.js
|
| @@ -21,7 +21,7 @@ function createTab(index, url) {
|
| }));
|
| }
|
|
|
| -var getProcessId = chrome.experimental.processes.getProcessIdForTab;
|
| +var getProcessId = chrome.processes.getProcessIdForTab;
|
|
|
| function pageUrl(letter) {
|
| return chrome.extension.getURL(letter + ".html");
|
| @@ -138,9 +138,9 @@ chrome.test.runTests([
|
| getProcessId(tabs[2].id, pass(function(pid2) {
|
| // Pages from same extension should share a process
|
| assertEq(pid1, pid2);
|
| - chrome.experimental.processes.getProcessInfo(pid1, false,
|
| + chrome.processes.getProcessInfo(pid1, false,
|
| function(pl1) {
|
| - chrome.experimental.processes.getProcessInfo(pid2, false,
|
| + chrome.processes.getProcessInfo(pid2, false,
|
| function (pl2) {
|
| var proc1 = pl1[pid1];
|
| var proc2 = pl2[pid2];
|
| @@ -173,7 +173,7 @@ chrome.test.runTests([
|
| },
|
|
|
| function idsInUpdateEvent() {
|
| - listenOnce(chrome.experimental.processes.onUpdated, function(processes) {
|
| + listenOnce(chrome.processes.onUpdated, function(processes) {
|
| // onUpdated should return a valid dictionary of processes,
|
| // indexed by process ID.
|
| var pids = Object.keys(processes);
|
| @@ -194,7 +194,7 @@ chrome.test.runTests([
|
| },
|
|
|
| function typesInUpdateEvent() {
|
| - listenOnce(chrome.experimental.processes.onUpdated, function(processes) {
|
| + listenOnce(chrome.processes.onUpdated, function(processes) {
|
| // Check types: 1 browser, 3 renderers, and 1 extension
|
| var browserCount = 0;
|
| var rendererCount = 0;
|
| @@ -222,7 +222,7 @@ chrome.test.runTests([
|
| },
|
|
|
| function propertiesOfProcesses() {
|
| - listenOnce(chrome.experimental.processes.onUpdated, function(processes) {
|
| + listenOnce(chrome.processes.onUpdated, function(processes) {
|
| for (pid in processes) {
|
| var process = processes[pid];
|
| validateProcessProperties(process, true, false);
|
| @@ -231,7 +231,7 @@ chrome.test.runTests([
|
| },
|
|
|
| function propertiesOfProcessesWithMemory() {
|
| - listenOnce(chrome.experimental.processes.onUpdatedWithMemory,
|
| + listenOnce(chrome.processes.onUpdatedWithMemory,
|
| function(processes) {
|
| for (pid in processes) {
|
| var process = processes[pid];
|
| @@ -241,24 +241,23 @@ chrome.test.runTests([
|
| },
|
|
|
| function terminateProcess() {
|
| - listenOnce(chrome.experimental.processes.onExited,
|
| + listenOnce(chrome.processes.onExited,
|
| function(processId, type, code) {
|
| assertTrue(processId > 0);
|
| });
|
| getProcessId(tabs[4].id, function(pid0) {
|
| - chrome.experimental.processes.terminate(pid0, function(killed) {
|
| + chrome.processes.terminate(pid0, function(killed) {
|
| chrome.test.assertTrue(killed);
|
| });
|
| });
|
| },
|
|
|
| function terminateProcessNonExisting() {
|
| - chrome.experimental.processes.terminate(31337,
|
| - fail("Process not found: 31337."));
|
| + chrome.processes.terminate(31337, fail("Process not found: 31337."));
|
| },
|
|
|
| function testOnCreated() {
|
| - listenOnce(chrome.experimental.processes.onCreated, function(process) {
|
| + listenOnce(chrome.processes.onCreated, function(process) {
|
| assertTrue("id" in process, "process doesn't have id property");
|
| assertTrue(process.id > 0, "id is not positive " + process.id);
|
| });
|
| @@ -266,7 +265,7 @@ chrome.test.runTests([
|
| },
|
|
|
| function testOnExited() {
|
| - listenOnce(chrome.experimental.processes.onExited,
|
| + listenOnce(chrome.processes.onExited,
|
| function(processId, type, code) {
|
| assertTrue(type >= 0 && type < 5);
|
| });
|
| @@ -278,8 +277,8 @@ chrome.test.runTests([
|
| function testGetProcessInfoList() {
|
| getProcessId(tabs[0].id, pass(function(pidTab0) {
|
| getProcessId(tabs[1].id, pass(function(pidTab1) {
|
| - chrome.experimental.processes.getProcessInfo([pidTab0, pidTab1], false,
|
| - pass(function(processes) {
|
| + chrome.processes.getProcessInfo([pidTab0, pidTab1], false,
|
| + pass(function(processes) {
|
| assertTrue(Object.keys(processes).length == 2);
|
| }));
|
| }));
|
| @@ -287,15 +286,13 @@ chrome.test.runTests([
|
| },
|
|
|
| function testGetProcessInfoSingle() {
|
| - chrome.experimental.processes.getProcessInfo(0, false,
|
| - pass(function(processes) {
|
| + chrome.processes.getProcessInfo(0, false, pass(function(processes) {
|
| assertTrue(Object.keys(processes).length == 1);
|
| }));
|
| },
|
|
|
| function testGetProcessInfo() {
|
| - chrome.experimental.processes.getProcessInfo([], false,
|
| - pass(function(processes) {
|
| + chrome.processes.getProcessInfo([], false, pass(function(processes) {
|
| assertTrue(Object.keys(processes).length >= 1);
|
| for (pid in processes) {
|
| var process = processes[pid];
|
| @@ -306,8 +303,7 @@ chrome.test.runTests([
|
| },
|
|
|
| function testGetProcessInfoWithMemory() {
|
| - chrome.experimental.processes.getProcessInfo(0, true,
|
| - pass(function(processes) {
|
| + chrome.processes.getProcessInfo(0, true, pass(function(processes) {
|
| for (pid in processes) {
|
| var process = processes[pid];
|
| validateProcessProperties(process, false, true);
|
| @@ -317,11 +313,10 @@ chrome.test.runTests([
|
| },
|
|
|
| function testOnUnresponsive() {
|
| - listenOnce(chrome.experimental.processes.onUnresponsive,
|
| - function(process) {
|
| + listenOnce(chrome.processes.onUnresponsive, function(process) {
|
| assertTrue(process.id == hangingTabProcess);
|
| // actually kill the process, just to make sure it won't hang the test
|
| - chrome.experimental.processes.terminate(process.id, function(killed) {
|
| + chrome.processes.terminate(process.id, function(killed) {
|
| chrome.test.assertTrue(killed);
|
| });
|
| });
|
|
|