Link GCM heartbeat with wake on wifi preference

components/gcm_driver/gcm_client.h

Index: components/gcm_driver/gcm_client.h
diff --git a/components/gcm_driver/gcm_client.h b/components/gcm_driver/gcm_client.h
index 9956c1003e93e3125866b2f2c0eb5fc8a126af53..87c1134e2617482cf322be7e416d986b32494735 100644
--- a/components/gcm_driver/gcm_client.h
+++ b/components/gcm_driver/gcm_client.h
@@ -31,6 +31,7 @@ namespace gcm {
 
 class Encryptor;
 struct AccountMapping;
+class MCSClient;
 
 // Interface that encapsulates the network communications with the Google Cloud
 // Messaging server. This interface is not supposed to be thread-safe.
@@ -299,6 +300,10 @@ class GCMClient {
 
   // Sets last token fetch time in persistent store.
   virtual void SetLastTokenFetchTime(const base::Time& time) = 0;
+
+  // Gets the MCSClient associated with this GCMClient or NULL if one does not
+  // exist yet.
+  virtual MCSClient* GetMCSClient() const = 0;

[Nicolas Zea, 2014/12/05 00:53:04]

I'm not a fan of exposing all the logic of MCSClient outside of the GCMClient.
How about just having a UpdateHeartbeatTimer method that just gets plumbed
through to the heartbeat manager?

[Chirantan Ekbote, 2014/12/05 21:49:05]

Done.

 };
 
 }  // namespace gcm