| Index: chrome/test/data/extensions/api_test/systeminfo/storage/test_storage_api.js
|
| diff --git a/chrome/test/data/extensions/api_test/systeminfo/storage/test_storage_api.js b/chrome/test/data/extensions/api_test/systeminfo/storage/test_storage_api.js
|
| index 42d6b53e56ebf6743bbb6b595c22f9a7b9ca0db5..24174d7f6ed69b8880f91f84703db40e67f94d96 100644
|
| --- a/chrome/test/data/extensions/api_test/systeminfo/storage/test_storage_api.js
|
| +++ b/chrome/test/data/extensions/api_test/systeminfo/storage/test_storage_api.js
|
| @@ -4,7 +4,6 @@
|
|
|
| // systemInfo.storage api test
|
| // browser_tests --gtest_filter=SystemInfoStorageApiTest.Storage
|
| -chrome.systemInfo = chrome.experimental.systemInfo;
|
|
|
| // Testing data should be the same as that in system_info_storage_apitest.cc
|
| var testData = [
|
| @@ -25,36 +24,33 @@ chrome.test.runTests([
|
| chrome.test.assertEq(testData[i].name, units[i].name);
|
| chrome.test.assertEq(testData[i].type, units[i].type);
|
| chrome.test.assertEq(testData[i].capacity, units[i].capacity);
|
| - chrome.test.assertEq(testData[i].availableCapacity,
|
| - units[i].availableCapacity);
|
| - testData[i].availableCapacity += testData[i].step;
|
| }
|
| }));
|
| },
|
| function testChangedEvent() {
|
| var numOfChangedEvent = 0;
|
| var callbackCompleted = chrome.test.callbackAdded();
|
| - chrome.systemInfo.storage.onAvailableCapacityChanged.addListener(
|
| - function listener(changeInfo) {
|
| - for (var i = 0; i < testData.length; ++i) {
|
| - if (changeInfo.id == testData[i].id) {
|
| - // Increase its availableCapacity since it will be queried before
|
| - // triggering onChanged event.
|
| - testData[i].availableCapacity += testData[i].step;
|
| - chrome.test.assertEq(testData[i].availableCapacity,
|
| - changeInfo.availableCapacity);
|
| - break;
|
| - }
|
| - }
|
| + chrome.experimental.systemInfo.storage.onAvailableCapacityChanged.
|
| + addListener(function listener(changeInfo) {
|
| + for (var i = 0; i < testData.length; ++i) {
|
| + if (changeInfo.id == testData[i].id) {
|
| + chrome.test.assertEq(testData[i].availableCapacity,
|
| + changeInfo.availableCapacity);
|
| + // Increase its availableCapacity since it will be queried
|
| + // before triggering onChanged event.
|
| + testData[i].availableCapacity += testData[i].step;
|
| + break;
|
| + }
|
| + }
|
|
|
| - if (i >= testData.length)
|
| - chrome.test.fail("No matched storage id is found!");
|
| + if (i >= testData.length)
|
| + chrome.test.fail("No matched storage id is found!");
|
|
|
| - if (++numOfChangedEvent > 10) {
|
| - chrome.systemInfo.storage.onAvailableCapacityChanged.removeListener(
|
| - listener);
|
| - setTimeout(callbackCompleted, 0);
|
| - }
|
| - });
|
| - }
|
| + if (++numOfChangedEvent > 10) {
|
| + chrome.experimental.systemInfo.storage.onAvailableCapacityChanged.
|
| + removeListener(listener);
|
| + setTimeout(callbackCompleted, 0);
|
| + }
|
| + });
|
| + }
|
| ]);
|
|
|