diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 02:13:55 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 02:13:55 +0000 |
| commit | 056ad2a8ef3d941e6e116fbc7ef1a6d747a6c691 (patch) | |
| tree | 342be06819c9bbfe9901c4ef1c93dc00fd8966cb /chrome/test | |
| parent | 3e4aabc2c524579517ec69c4cc32ec2b3297faef (diff) | |
| download | chromium_src-056ad2a8ef3d941e6e116fbc7ef1a6d747a6c691.zip chromium_src-056ad2a8ef3d941e6e116fbc7ef1a6d747a6c691.tar.gz chromium_src-056ad2a8ef3d941e6e116fbc7ef1a6d747a6c691.tar.bz2 | |
Use process-per-app-instance for hosted apps without background permission.
Also update ExtensionProcessManager to map SiteInstances to extensions,
rather than extensions to processes.
BUG=87644
TEST=AppApiTest.AppProcessInstances
Review URL: http://codereview.chromium.org/7328029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
4 files changed, 21 insertions, 2 deletions
diff --git a/chrome/test/data/extensions/api_test/app_process/manifest.json b/chrome/test/data/extensions/api_test/app_process/manifest.json index 42a95fc..f8eb88a 100644 --- a/chrome/test/data/extensions/api_test/app_process/manifest.json +++ b/chrome/test/data/extensions/api_test/app_process/manifest.json @@ -1,7 +1,7 @@ { "name": "app_process", "version": "0.1", - "description": "Tests that app URLs are grouped into the right process", + "description": "Tests that app URLs with the background permission are grouped into the same process.", "app": { "urls": [ "http://localhost/files/extensions/api_test/app_process/path1", @@ -13,5 +13,8 @@ "launch": { "web_url": "http://localhost/files/extensions/api_test/app_process/path1/foo.html" } - } + }, + "permissions": [ + "background" + ] } diff --git a/chrome/test/data/extensions/api_test/app_process_instances/manifest.json b/chrome/test/data/extensions/api_test/app_process_instances/manifest.json new file mode 100644 index 0000000..f502071 --- /dev/null +++ b/chrome/test/data/extensions/api_test/app_process_instances/manifest.json @@ -0,0 +1,14 @@ +{ + "name": "app_process_instances", + "version": "0.1", + "description": "Tests that app URLs without the background permission are not consolidated.", + "app": { + "urls": [ + "http://localhost/files/extensions/api_test/app_process_instances/path1", + "http://localhost/files/extensions/api_test/app_process_instances/path2" + ], + "launch": { + "web_url": "http://localhost/files/extensions/api_test/app_process_instances/path1/empty.html" + } + } +} diff --git a/chrome/test/data/extensions/api_test/app_process_instances/path1/empty.html b/chrome/test/data/extensions/api_test/app_process_instances/path1/empty.html new file mode 100644 index 0000000..d3cdf0a --- /dev/null +++ b/chrome/test/data/extensions/api_test/app_process_instances/path1/empty.html @@ -0,0 +1 @@ +<title>Unmodified</title> diff --git a/chrome/test/data/extensions/api_test/app_process_instances/path2/empty.html b/chrome/test/data/extensions/api_test/app_process_instances/path2/empty.html new file mode 100644 index 0000000..d3cdf0a --- /dev/null +++ b/chrome/test/data/extensions/api_test/app_process_instances/path2/empty.html @@ -0,0 +1 @@ +<title>Unmodified</title> |