diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 16:46:50 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 16:46:50 +0000 |
commit | 6384d870fbb79b09f4d5fc04ec06ae5525be06d9 (patch) | |
tree | ff9701895bfc849fdd7fdc096b59a31312826075 | |
parent | 9ae2ee0b2e657a1556edb9646c032ab50b291f09 (diff) | |
download | chromium_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
-rw-r--r-- | chrome/browser/extensions/extension_rlz_apitest.cc | 2 | ||||
-rw-r--r-- | chrome/browser/extensions/extension_rlz_module.cc | 16 | ||||
-rw-r--r-- | chrome/common/extensions/api/extension_api.json | 3 | ||||
-rw-r--r-- | chrome/test/data/extensions/api_test/rlz/test.js | 11 |
4 files changed, 7 insertions, 25 deletions
diff --git a/chrome/browser/extensions/extension_rlz_apitest.cc b/chrome/browser/extensions/extension_rlz_apitest.cc index 7340647..c9c1416 100644 --- a/chrome/browser/extensions/extension_rlz_apitest.cc +++ b/chrome/browser/extensions/extension_rlz_apitest.cc @@ -66,7 +66,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Rlz) { // Now run all the tests. ASSERT_TRUE(RunExtensionTest("rlz")) << message_; - ASSERT_EQ(2, MockRlzSendFinancialPingFunction::expected_count()); + ASSERT_EQ(1, MockRlzSendFinancialPingFunction::expected_count()); ExtensionFunctionDispatcher::ResetFunctions(); // Now make sure we recorded what was expected. If the code in test.js diff --git a/chrome/browser/extensions/extension_rlz_module.cc b/chrome/browser/extensions/extension_rlz_module.cc index e31fc69..25724be 100644 --- a/chrome/browser/extensions/extension_rlz_module.cc +++ b/chrome/browser/extensions/extension_rlz_module.cc @@ -144,18 +144,10 @@ bool RlzSendFinancialPingFunction::RunImpl() { bool exclude_machine_id; EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(6, &exclude_machine_id)); - // rlz_lib::SendFinancialPing() will not send a ping more often than once in - // any 24-hour period. Calling it more often has no effect. If a ping is - // not sent false is returned, but this is not an error, so we should not - // use the return value of rlz_lib::SendFinancialPing() as the return value - // of this function. Callers interested in the return value can register - // an optional callback function. - bool sent = rlz_lib::SendFinancialPing(product, access_points.get(), - signature.c_str(), brand.c_str(), - id.c_str(), lang.c_str(), - exclude_machine_id); - result_.reset(Value::CreateBooleanValue(sent)); - return true; + return rlz_lib::SendFinancialPing(product, access_points.get(), + signature.c_str(), brand.c_str(), + id.c_str(), lang.c_str(), + exclude_machine_id); } bool RlzClearProductStateFunction::RunImpl() { 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"} ] }, { diff --git a/chrome/test/data/extensions/api_test/rlz/test.js b/chrome/test/data/extensions/api_test/rlz/test.js index 445f023..6fb4239 100644 --- a/chrome/test/data/extensions/api_test/rlz/test.js +++ b/chrome/test/data/extensions/api_test/rlz/test.js @@ -139,16 +139,7 @@ chrome.test.runTests([ chrome.experimental.rlz.sendFinancialPing('D', ['D3'], 'sig', 'TEST', 'id', 'en', false); - // try another call, this time the ping should not be sent. - chrome.experimental.rlz.sendFinancialPing('D', ['D3'], 'sig', 'TEST', - 'id', 'en', false, - function(sent) { - if (sent) { - chrome.test.fail(); - } else { - chrome.test.succeed(); - } - }); + chrome.test.succeed(); } ]); |