Link GCM heartbeat with wake on wifi preference

google_apis/gcm/engine/mcs_client.h

 // Copyright 2013 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.
 
 #ifndef GOOGLE_APIS_GCM_ENGINE_MCS_CLIENT_H_
 #define GOOGLE_APIS_GCM_ENGINE_MCS_CLIENT_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 82 matching lines @@
   typedef base::Callback<
       void(int64 user_serial_number,
            const std::string& app_id,
            const std::string& message_id,
            MessageSendStatus status)> OnMessageSentCallback;
 
   MCSClient(const std::string& version_string,
             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
   // as unacknowledged message information from the GCM storage, if it exists,
   // passing the id/token information back via |initialization_callback| along
   // with a |success == true| result. If no GCM information is present (and
   // this is therefore a fresh client), a clean GCM store will be created and
   // values of 0 will be returned via |initialization_callback| with
   // |success == true|.
   /// If an error loading the GCM store is encountered,
@@ skipping 26 matching lines @@
 
   // Returns the size of the send message queue.
   int GetSendQueueSize() const;
 
   // Returns the size of the resend messaage queue.
   int GetResendQueueSize() const;
 
   // 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;
   typedef std::vector<StreamId> StreamIdList;
   typedef std::vector<PersistentId> PersistentIdList;
   typedef std::map<StreamId, PersistentId> StreamIdToPersistentIdMap;
   typedef linked_ptr<ReliablePacketInfo> MCSPacketInternal;
 
   // Resets the internal state and builds a new login request, acknowledging
   // any pending server-to-device messages and rebuilding the send queue
@@ skipping 120 matching lines @@
   GCMStatsRecorder* recorder_;
 
   base::WeakPtrFactory<MCSClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MCSClient);
 };
 
 } // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_MCS_CLIENT_H_