Link GCM heartbeat with wake on wifi preference

google_apis/gcm/engine/heartbeat_manager.cc

Index: google_apis/gcm/engine/heartbeat_manager.cc
diff --git a/google_apis/gcm/engine/heartbeat_manager.cc b/google_apis/gcm/engine/heartbeat_manager.cc
index b6b0e8892ebb91d357d54365054f6531a8086dfa..88562fd75bab06933bf744b025dd7a2332a1dde4 100644
--- a/google_apis/gcm/engine/heartbeat_manager.cc
+++ b/google_apis/gcm/engine/heartbeat_manager.cc
@@ -80,6 +80,16 @@ base::TimeTicks HeartbeatManager::GetNextHeartbeatTime() const {
     return base::TimeTicks();
 }
 
+void HeartbeatManager::UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) {
+  bool was_running = heartbeat_timer_->IsRunning();
+
+  Stop();

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

I don't think you should be calling Stop() here. If we were waiting for a
heartbeat ack, we should still be waiting for one even if the user happened to
flip the pref.

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

Done.

+  heartbeat_timer_ = timer.Pass();
+
+  if (was_running)
+    RestartTimer();
+}
+
 void HeartbeatManager::OnHeartbeatTriggered() {
   // Reset the weak pointers used for heartbeat checks.
   weak_ptr_factory_.InvalidateWeakPtrs();