summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 17:15:47 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 17:15:47 +0000
commit5c1cea3f04d6913960bc25b233d79410406bd3ee (patch)
treed4f20d40a5b41ac3b8288d10251fd2a3ccca0109 /chrome/common
parentba6e39cbfcbc4b91edf95a6d82216ee22d2ad3d5 (diff)
downloadchromium_src-5c1cea3f04d6913960bc25b233d79410406bd3ee.zip
chromium_src-5c1cea3f04d6913960bc25b233d79410406bd3ee.tar.gz
chromium_src-5c1cea3f04d6913960bc25b233d79410406bd3ee.tar.bz2
share extension API test framework
BUG=18442 TEST=ExtensionApiTest.* Review URL: http://codereview.chromium.org/173622 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/common_resources.grd2
-rwxr-xr-xchrome/common/extensions/api/extension_api.json8
2 files changed, 6 insertions, 4 deletions
diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd
index 5fc44f4..457cd27 100644
--- a/chrome/common/common_resources.grd
+++ b/chrome/common/common_resources.grd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This comment is only here because changes to resources are not picked up
-without changes to the corresponding grd file. rw -->
+without changes to the corresponding grd file. -->
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/common_resources.h" type="rc_header">
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index f0cca69..9b56818 100755
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -932,7 +932,7 @@
"types": [],
"functions": [
{
- "name": "fail",
+ "name": "notifyFail",
"type": "function",
"description": "Notify the browser process that test code running in the extension failed. This is only used for internal unit testing.",
"parameters": [
@@ -940,10 +940,12 @@
]
},
{
- "name": "pass",
+ "name": "notifyPass",
"type": "function",
"description": "Notify the browser process that test code running in the extension passed. This is only used for internal unit testing.",
- "parameters": []
+ "parameters": [
+ {"type": "string", "name": "message", "optional": true}
+ ]
}
],
"events": []