Link GCM heartbeat with wake on wifi preference

google_apis/gcm/engine/heartbeat_manager.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/metrics/histogram.h"
 #include "base/timer/timer.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/base/network_change_notifier.h"
@@ skipping 62 matching lines @@
   server_interval_ms_ = config.interval_ms();
 }
 
 base::TimeTicks HeartbeatManager::GetNextHeartbeatTime() const {
   if (heartbeat_timer_->IsRunning())
     return heartbeat_timer_->desired_run_time();
   else
     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();
 
   if (waiting_for_ack_) {
     LOG(WARNING) << "Lost connection to MCS, reconnecting.";
     Stop();
     trigger_reconnect_callback_.Run();
     return;
   }
@@ skipping 60 matching lines @@
 
   // Otherwise check again later.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&HeartbeatManager::CheckForMissedHeartbeat,
                  weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
 }
 
 }  // namespace gcm