[GCM] Wiring heartbeat interval calls to GCMDriver

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 a81bcbe95bb9c4cd843d861940749297c088fea6..0ddf5ddb3f986b30dec8f38a44aabb656990c175 100644
--- a/google_apis/gcm/engine/mcs_client.h
+++ b/google_apis/gcm/engine/mcs_client.h
@@ -160,8 +160,8 @@ class GCM_EXPORT MCSClient {
   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:
@@ -226,7 +226,7 @@ class GCM_EXPORT MCSClient {
   MCSPacketInternal PopMessageForSend();
 
   // Gets the minimum interval from the map of scopes to intervals.
-  int GetMinCustomHeartbeatInterval();
+  int GetMinHeartbeatInterval();
 
   // Local version string. Sent on login.
   const std::string version_string_;