summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbrucedawson <brucedawson@chromium.org>2014-12-05 17:16:28 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-06 01:16:44 +0000
commitedef0ee80a3cb3b3d0d429c96cd124a390b500c7 (patch)
tree2e0271241b757a1f96621d661ef711db86e6ff19 /components
parent3e2062be7c36cea30981cac6f681d5c6f030d1bd (diff)
downloadchromium_src-edef0ee80a3cb3b3d0d429c96cd124a390b500c7.zip
chromium_src-edef0ee80a3cb3b3d0d429c96cd124a390b500c7.tar.gz
chromium_src-edef0ee80a3cb3b3d0d429c96cd124a390b500c7.tar.bz2
Fix parameter types of CompareDelaySeconds from bool to int64.
CompareDelaySeconds takes two bool parameters when it is clearly intended to take two int64 parameters. This was found by VC++'s /analyze which said: src\components\gcm_driver\gcm_driver_desktop_unittest.cc(1067) : warning C6323: Use of arithmetic operator on Boolean type(s). This bug was introduced in: https://codereview.chromium.org/561943002 BUG=427616 Review URL: https://codereview.chromium.org/772383003 Cr-Commit-Position: refs/heads/master@{#307134}
Diffstat (limited to 'components')
-rw-r--r--components/gcm_driver/gcm_driver_desktop_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc
index f27d018..1424fed 100644
--- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
+++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -1008,8 +1008,8 @@ class GCMChannelStatusSyncerTest : public GCMDriverTest {
void SetUp() override;
void CompleteGCMChannelStatusRequest(bool enabled, int poll_interval_seconds);
- bool CompareDelaySeconds(bool expected_delay_seconds,
- bool actual_delay_seconds);
+ bool CompareDelaySeconds(int64 expected_delay_seconds,
+ int64 actual_delay_seconds);
GCMChannelStatusSyncer* syncer() {
return driver()->gcm_channel_status_syncer_for_testing();
@@ -1057,7 +1057,7 @@ void GCMChannelStatusSyncerTest::CompleteGCMChannelStatusRequest(
}
bool GCMChannelStatusSyncerTest::CompareDelaySeconds(
- bool expected_delay_seconds, bool actual_delay_seconds) {
+ int64 expected_delay_seconds, int64 actual_delay_seconds) {
// Most of time, the actual delay should not be smaller than the expected
// delay.
if (actual_delay_seconds >= expected_delay_seconds)