Link GCM heartbeat with wake on wifi preference

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/message_loop/message_loop.h"
+#include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 
 mcs_proto::HeartbeatConfig BuildHeartbeatConfig(int interval_ms) {
@@ skipping 148 matching lines @@
   // Triggering and acking the heartbeat should result in a heartbeat being
   // posted with the new interval.
   manager()->TriggerHearbeat();
   manager()->OnHeartbeatAcked();
 
   EXPECT_LE(manager()->GetNextHeartbeatTime() - base::TimeTicks::Now(),
             base::TimeDelta::FromMilliseconds(kIntervalMs));
   EXPECT_NE(heartbeat, manager()->GetNextHeartbeatTime());
 }
 
+// Updating the timer used for heartbeats before starting should not start the
+// timer.
+TEST_F(HeartbeatManagerTest, UpdateTimerBeforeStart) {
+  manager()->UpdateHeartbeatTimer(
+      make_scoped_ptr(new base::Timer(true, false)));
+  EXPECT_TRUE(manager()->GetNextHeartbeatTime().is_null());
+}
+
+// Updating the timer used for heartbeats after starting should restart the
+// timer and update the heartbeat time.
+TEST_F(HeartbeatManagerTest, UpdateTimerAfterStart) {
+  StartManager();
+  base::TimeTicks heartbeat = manager()->GetNextHeartbeatTime();
+
+  base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(2));

[Nicolas Zea, 2014/12/05 00:53:05]

why is this necessary?

[Chirantan Ekbote, 2014/12/05 21:49:05]

Because otherwise the test would be too fast to reliably see a difference in the
scheduled heartbeat time.  But since the new patch set makes the timer change
transparent, this is no longer necessary.

+
+  manager()->UpdateHeartbeatTimer(
+      make_scoped_ptr(new base::Timer(true, false)));
+  EXPECT_NE(heartbeat, manager()->GetNextHeartbeatTime());
+}
+
 // Stopping the manager should reset the heartbeat timer.
 TEST_F(HeartbeatManagerTest, Stop) {
   StartManager();
   EXPECT_GT(manager()->GetNextHeartbeatTime(), base::TimeTicks::Now());
 
   manager()->Stop();
   EXPECT_TRUE(manager()->GetNextHeartbeatTime().is_null());
 }
 
 // Simulate missing a heartbeat by manually invoking the check method. The
 // heartbeat should only be triggered once, and only if the heartbeat timer
 // is running. Because the period is several minutes, none should fire.
 TEST_F(HeartbeatManagerTest, MissedHeartbeat) {
   // Do nothing while stopped.
   manager()->TriggerMissedHeartbeatCheck();
   StartManager();
   EXPECT_EQ(0, heartbeats_sent());
 
   // Do nothing before the period is reached.
   manager()->TriggerMissedHeartbeatCheck();
   EXPECT_EQ(0, heartbeats_sent());
 }
 
 }  // namespace
 
 }  // namespace gcm