summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 16:46:50 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 16:46:50 +0000
commit6384d870fbb79b09f4d5fc04ec06ae5525be06d9 (patch)
treeff9701895bfc849fdd7fdc096b59a31312826075 /chrome/common/extensions
parent9ae2ee0b2e657a1556edb9646c032ab50b291f09 (diff)
downloadchromium_src-6384d870fbb79b09f4d5fc04ec06ae5525be06d9.zip
chromium_src-6384d870fbb79b09f4d5fc04ec06ae5525be06d9.tar.gz
chromium_src-6384d870fbb79b09f4d5fc04ec06ae5525be06d9.tar.bz2
Back out r58827. It caused browser_tests ExtensionApiTest.Rlz to fail.
Failures: http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests/builds/22649/steps/browser_tests/logs/stdio http://build.chromium.org/buildbot/waterfall/builders/Vista%20Tests/builds/22157/steps/browser_tests/logs/stdio ( RUN ) sendFinancialPing ( FAILED ) sendFinancialPing Got EXTENSION_TEST_FAILED notification. .\browser\extensions\extension_rlz_apitest.cc(67): error: Value of: RunExtensionTest("rlz") Actual: false Expected: true FAIL (no message) at Object.callback (chrome-extension://acmddjjmpkiijbjcdpchhmniojioobgh/test.js:147:63) at Object.<anonymous> (chrome/ExtensionProcessBindings:124:19) [ FAILED ] ExtensionApiTest.Rlz (1531 ms) BUG=54294 TEST=green tests TBR=rogerta@google.com Review URL: http://codereview.chromium.org/3371006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions')
-rw-r--r--chrome/common/extensions/api/extension_api.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 1336ff0..0ca4808 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -3141,8 +3141,7 @@
{"name": "brand", "type": "string"},
{"name": "id", "type": "string"},
{"name": "lang", "type": "string"},
- {"name": "exclude_machine_id", "type": "boolean"},
- {"name": "callback", "type": "function", "optional": true, "parameters": [{"name": "sent", "type": "boolean"}]}
+ {"name": "exclude_machine_id", "type": "boolean"}
]
},
{