[GCM] Wiring heartbeat interval calls to GCMDriver

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 142 matching lines @@
 
   // Allows a caller to set a heartbeat interval (in milliseconds) with which
   // the MCS connection will be monitored on both ends, to detect device
   // presence. In case the newly set interval is less then the current one,
   // connection will be restarted with new heartbeat interval. Valid values have
   // to be between GetMax/GetMinClientHeartbeatIntervalMs of HeartbeatManager,
   // otherwise the setting won't take effect.
   void AddHeartbeatInterval(const std::string& scope, int interval_ms);
   void RemoveHeartbeatInterval(const std::string& scope);
 
-  HeartbeatManager& GetHeartbeatManagerForTesting() {
-    return heartbeat_manager_;
+  HeartbeatManager* GetHeartbeatManagerForTesting() {
+    return &heartbeat_manager_;
   }
 
  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;
 
@@ skipping 43 matching lines @@
       ConnectionFactory::ConnectionResetReason reason);
 
   // Runs the message_sent_callback_ with send |status| of the |protobuf|.
   void NotifyMessageSendStatus(const google::protobuf::MessageLite& protobuf,
                                MessageSendStatus status);
 
   // Pops the next message from the front of the send queue (cleaning up
   // any associated state).
   MCSPacketInternal PopMessageForSend();
 
-  // Gets the minimum interval from the map of scopes to intervals.
-  int GetMinCustomHeartbeatInterval();
+  // Gets the minimum interval from the map of scopes to intervals in
+  // milliseconds.
+  int GetMinHeartbeatIntervalMs();
 
   // Local version string. Sent on login.
   const std::string version_string_;
 
   // Clock for enforcing TTL. Passed in for testing.
   base::Clock* const clock_;
 
   // Client state.
   State state_;
 
@@ skipping 64 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_