Link GCM heartbeat with wake on wifi preference

components/timers/alarm_timer.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 "components/timers/alarm_timer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
       can_wake_from_suspend_(false),
       origin_message_loop_(NULL),
       weak_factory_(this) {
   can_wake_from_suspend_ = delegate_->Init(weak_factory_.GetWeakPtr());
 }
 
 AlarmTimer::~AlarmTimer() {
   Stop();
 }
 
+void AlarmTimer::OnTimerFired() {
+  if (!base::Timer::IsRunning())
+    return;
+
+  DCHECK(pending_task_.get());
+
+  // Take ownership of the pending user task, which is going to be cleared by
+  // the Stop() or Reset() functions below.
+  scoped_ptr<base::PendingTask> pending_user_task(pending_task_.Pass());
+
+  // Re-schedule or stop the timer as requested.
+  if (base::Timer::is_repeating())
+    Reset();
+  else
+    Stop();
+
+  // Now run the user task.
+  base::MessageLoop::current()->task_annotator()->RunTask(
+      "AlarmTimer::Reset", "AlarmTimer::OnTimerFired", *pending_user_task);
+}
+
 void AlarmTimer::Stop() {
   if (!can_wake_from_suspend_) {
     base::Timer::Stop();
     return;
   }
 
   // Clear the running flag, stop the delegate, and delete the pending task.
   base::Timer::set_is_running(false);
   delegate_->Stop();
   pending_task_.reset();
@@ skipping 45 matching lines @@
 
   // Now start up the timer.
   delegate_->Reset(base::Timer::GetCurrentDelay());
   base::Timer::set_is_running(true);
 }
 
 void AlarmTimer::WillDestroyCurrentMessageLoop() {
   Stop();
 }
 
-void AlarmTimer::OnTimerFired() {
-  if (!base::Timer::is_running())
-    return;
-
-  DCHECK(pending_task_.get());
-
-  // Take ownership of the pending user task, which is going to be cleared by
-  // the Stop() or Reset() functions below.
-  scoped_ptr<base::PendingTask> pending_user_task(pending_task_.Pass());
-
-  // Re-schedule or stop the timer as requested.
-  if (base::Timer::is_repeating())
-    Reset();
-  else
-    Stop();
-
-  // Now run the user task.
-  base::MessageLoop::current()->task_annotator()->RunTask(
-      "AlarmTimer::Reset", "AlarmTimer::OnTimerFired", *pending_user_task);
-}
-
 }  // namespace timers