[GCM] Add heartbeat manager and reconnection logic due to heartbeat failure

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>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/timer/timer.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/engine/connection_handler.h"
+#include "google_apis/gcm/engine/heartbeat_manager.h"
 #include "google_apis/gcm/engine/rmq_store.h"
 
 namespace google {
 namespace protobuf {
 class MessageLite;
 }  // namespace protobuf
 }  // namespace google
 
 namespace mcs_proto {
 class LoginRequest;
@@ skipping 115 matching lines @@
   // in |id_list|.
   void HandleSelectiveAck(const PersistentIdList& id_list);
   // Handle server confirmation of a device message, including device's
   // acknowledgment of receipt of messages.
   void HandleServerConfirmedReceipt(StreamId device_stream_id);
 
   // Generates a new persistent id for messages.
   // Virtual for testing.
   virtual PersistentId GetNextPersistentId();
 
+  // Helper for the heartbeat manager to signal a connection reset.
+  void OnConnectionResetByHeartbeat();
+
   // Client state.
   State state_;
 
   // Callbacks for owner.
   InitializationCompleteCallback initialization_callback_;
   OnMessageReceivedCallback message_received_callback_;
   OnMessageSentCallback message_sent_callback_;
 
   // The android id and security token in use by this device.
   uint64 android_id_;
@@ skipping 37 matching lines @@
   std::map<StreamId, PersistentIdList> acked_server_ids_;
 
   // Those server messages from a previous connection that were not fully
   // acknowledged. They do not have associated stream ids, and will be
   // acknowledged on the next login attempt.
   PersistentIdList restored_unackeds_server_ids_;
 
   // The reliable message queue persistent store. Owned by the caller.
   RMQStore* rmq_store_;
 
-  // ----- Heartbeats -----
-  // The current heartbeat interval.
-  base::TimeDelta heartbeat_interval_;
-  // Timer for triggering heartbeats.
-  base::Timer heartbeat_timer_;
+  // Manager to handle triggering/detecting heartbeats.
+  HeartbeatManager heartbeat_manager_;
 
   base::WeakPtrFactory<MCSClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MCSClient);
 };
 
 } // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_MCS_CLIENT_H_