summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 00:21:20 +0000
committerjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 00:21:20 +0000
commitbb7f4095f73cf4c0ce0fe8a3cff37def81311d57 (patch)
tree7622be5faaa5342ea48c2627eb45ab1586d2be4d /chrome/test
parent31ae9addcfc81537293f5c4fc6c12ac9d8006159 (diff)
downloadchromium_src-bb7f4095f73cf4c0ce0fe8a3cff37def81311d57.zip
chromium_src-bb7f4095f73cf4c0ce0fe8a3cff37def81311d57.tar.gz
chromium_src-bb7f4095f73cf4c0ce0fe8a3cff37def81311d57.tar.bz2
Show crashed extensions on chrome://extensions.
BUG=31535 TEST=updated JSON serialization tests, added check in browsertest, manual test using task manager to terminate an extension process Review URL: http://codereview.chromium.org/6158001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json1
-rw-r--r--chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json1
-rw-r--r--chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json1
3 files changed, 3 insertions, 0 deletions
diff --git a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json
index 283dd5a..ab9e575 100644
--- a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json
+++ b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension1.json
@@ -3,6 +3,7 @@
"version": "1.0.0.0",
"name": "__MSG_chrome_extension_name__",
"enabled": true,
+ "terminated": false,
"description": "__MSG_chrome_extension_description__",
"permissions": ["http://*.google.com/*", "https://*.google.com/*"],
"allow_reload": false,
diff --git a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json
index 790bb00..078d343 100644
--- a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json
+++ b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension2.json
@@ -3,6 +3,7 @@
"version": "2",
"name": "My extension 2",
"enabled": true,
+ "terminated": false,
"description": "",
"permissions": [],
"allow_reload": false,
diff --git a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json
index 62077f8..7cfb429 100644
--- a/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json
+++ b/chrome/test/data/extensions/ui/create_extension_detail_value_expected_output/good-extension3.json
@@ -3,6 +3,7 @@
"version": "1.0",
"name": "My extension 3",
"enabled": true,
+ "terminated": false,
"description": "",
"permissions": [],
"allow_reload": false,