Link GCM heartbeat with wake on wifi preference

components/gcm_driver/gcm_driver_desktop.h

Index: components/gcm_driver/gcm_driver_desktop.h
diff --git a/components/gcm_driver/gcm_driver_desktop.h b/components/gcm_driver/gcm_driver_desktop.h
index 407d91a443fdb72ce4f7a16a6599f38b2f4012f3..270e16813853a08242793d8280eb4a6b60cd04aa 100644
--- a/components/gcm_driver/gcm_driver_desktop.h
+++ b/components/gcm_driver/gcm_driver_desktop.h
@@ -83,6 +83,7 @@ class GCMDriverDesktop : public GCMDriver {
   void RemoveAccountMapping(const std::string& account_id) override;
   base::Time GetLastTokenFetchTime() override;
   void SetLastTokenFetchTime(const base::Time& time) override;
+  void WakeFromSuspendForHeartbeat(bool wake) override;
 
   // Exposed for testing purpose.
   bool gcm_enabled() const { return gcm_enabled_; }
@@ -163,6 +164,9 @@ class GCMDriverDesktop : public GCMDriver {
 
   scoped_ptr<GCMDelayedTaskController> delayed_task_controller_;
 
+  // Callback that is run when the GCM service is started.
+  base::Closure gcm_started_callback_;
+
   // For all the work occurring on the IO thread. Must be destroyed on the IO
   // thread.
   scoped_ptr<IOWorker> io_worker_;