[GCM] Fixing the client interval interaction with heartbeat ack

google_apis/gcm/engine/heartbeat_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/gcm/engine/heartbeat_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 269 matching lines @@
   // Triggering and acking the heartbeat should result in a heartbeat being
   // posted with the new interval.
   manager()->TriggerHearbeat();
   manager()->OnHeartbeatAcked();
 
   till_heartbeat = manager()->GetNextHeartbeatTime() - base::TimeTicks::Now();
   EXPECT_LE(till_heartbeat, base::TimeDelta::FromMilliseconds(
       manager()->GetMaxClientHeartbeatIntervalMs()));
 }
 
+// Verifies that client interval is reset appropriately after the heartbeat is
+// triggered. See http://crbug.com/591490 for details.
+TEST_F(HeartbeatManagerTest, ClientIntervalAfterHeartbeatTriggered) {
+  const int kCustomIntervalMs = 180 * 1000;  // 180 seconds.
+  manager()->SetClientHeartbeatIntervalMs(kCustomIntervalMs);
+  StartManager();
+
+  // This changes the interval as manager awaits a heartbeat ack.
+  manager()->TriggerHearbeat();
+  const int kDefaultAckIntervalMs = 60 * 1000;  // 60 seconds.
+  base::TimeTicks heartbeat = manager()->GetNextHeartbeatTime();
+  EXPECT_LE(heartbeat - base::TimeTicks::Now(),
+            base::TimeDelta::FromMilliseconds(kDefaultAckIntervalMs));
+
+  // This should reset the interval to the custom interval.
+  manager()->OnHeartbeatAcked();
+  heartbeat = manager()->GetNextHeartbeatTime();
+  EXPECT_GT(heartbeat - base::TimeTicks::Now(),
+            base::TimeDelta::FromMilliseconds(kDefaultAckIntervalMs));
+  EXPECT_LE(heartbeat - base::TimeTicks::Now(),
+            base::TimeDelta::FromMilliseconds(kCustomIntervalMs));
+}
+
 }  // namespace
 
 }  // namespace gcm