Link GCM heartbeat with wake on wifi preference

google_apis/gcm/engine/mcs_client.h

Index: google_apis/gcm/engine/mcs_client.h
diff --git a/google_apis/gcm/engine/mcs_client.h b/google_apis/gcm/engine/mcs_client.h
index 96c1580e31596276793490a1a9f33b049e82b8e0..ce4edf6c58d927d0dcfa290937a82fa30d83f9f5 100644
--- a/google_apis/gcm/engine/mcs_client.h
+++ b/google_apis/gcm/engine/mcs_client.h
@@ -100,8 +100,7 @@ class GCM_EXPORT MCSClient {
             base::Clock* clock,
             ConnectionFactory* connection_factory,
             GCMStore* gcm_store,
-            GCMStatsRecorder* recorder,
-            scoped_ptr<base::Timer> heartbeat_timer);
+            GCMStatsRecorder* recorder);
   virtual ~MCSClient();
 
   // Initialize the client. Will load any previous id/token information as well
@@ -148,6 +147,9 @@ class GCM_EXPORT MCSClient {
   // Returns text representation of the state enum.
   std::string GetStateString() const;
 
+  // Updates the timer used by |heartbeat_manager_| for sending heartbeats.
+  void UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer);
+
  private:
   typedef uint32 StreamId;
   typedef std::string PersistentId;