| Index: chrome/test/data/extensions/api_test/webstore_private/accepted.js
|
| diff --git a/chrome/test/data/extensions/api_test/webstore_private/accepted.js b/chrome/test/data/extensions/api_test/webstore_private/accepted.js
|
| index e2712d9d8a7305ecb31f433a9e211fc053442dde..e3c42e409c3033a9af83f6fb9154ed08144301fd 100644
|
| --- a/chrome/test/data/extensions/api_test/webstore_private/accepted.js
|
| +++ b/chrome/test/data/extensions/api_test/webstore_private/accepted.js
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -// Tests where the beginInstallWithManifest dialog would be auto-accepted
|
| +// Tests where the beginInstallWithManifest2 dialog would be auto-accepted
|
| // (including a few cases where this does not matter).
|
|
|
| var tests = [
|
| @@ -17,46 +17,39 @@ var tests = [
|
| function invalidID() {
|
| var expectedError = "Invalid id";
|
| var id = "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz";
|
| - chrome.webstorePrivate.beginInstallWithManifest(
|
| - id, "", getManifest(), callbackFail(expectedError));
|
| + chrome.webstorePrivate.beginInstallWithManifest2(
|
| + { 'id':id, 'manifest':getManifest() }, callbackFail(expectedError));
|
| },
|
|
|
| function missingVersion() {
|
| var manifestObj = JSON.parse(getManifest());
|
| delete manifestObj["version"];
|
| var manifest = JSON.stringify(manifestObj);
|
| - chrome.webstorePrivate.beginInstallWithManifest(
|
| - extensionId,
|
| - "",
|
| - manifest,
|
| + chrome.webstorePrivate.beginInstallWithManifest2(
|
| + { 'id':extensionId, 'manifest': manifest },
|
| callbackFail("Invalid manifest", function(result) {
|
| assertEq("manifest_error", result);
|
| }));
|
| },
|
|
|
| function successfulInstall() {
|
| - // See things through all the way to a successful install, and then we
|
| - // uninstall the extension to clean up.
|
| - listenOnce(chrome.management.onInstalled, function(info) {
|
| + // See things through all the way to a successful install.
|
| + listenOnce(chrome.management.onInstalled, callbackPass(function(info) {
|
| assertEq(info.id, extensionId);
|
| - chrome.management.uninstall(extensionId, callbackPass());
|
| - });
|
| + }));
|
|
|
| var manifest = getManifest();
|
| getIconData(function(icon) {
|
|
|
| // Begin installing.
|
| - chrome.webstorePrivate.beginInstallWithManifest(extensionId,
|
| - icon,
|
| - manifest,
|
| - function(result) {
|
| + chrome.webstorePrivate.beginInstallWithManifest2(
|
| + {'id': extensionId,'iconData': icon, 'manifest': manifest },
|
| + function(result) {
|
| assertNoLastError();
|
| assertEq(result, "");
|
|
|
| // Now complete the installation.
|
| - chrome.webstorePrivate.completeInstall(extensionId, function() {
|
| - assertNoLastError();
|
| - });
|
| + chrome.webstorePrivate.completeInstall(extensionId, callbackPass());
|
| });
|
| });
|
| }
|
|
|