[GCM] Wiring heartbeat interval calls to GCMDriver

components/gcm_driver/gcm_client_impl.cc

Index: components/gcm_driver/gcm_client_impl.cc
diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
index 1c9f64fbe447498e27d1ca4a8c47b77a210adb1b..69605ae7012f38ea80fe7bbf4fd4e8f97e34142f 100644
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -530,6 +530,17 @@ void GCMClientImpl::UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) {
   mcs_client_->UpdateHeartbeatTimer(timer.Pass());
 }
 
+void GCMClientImpl::AddHeartbeatInterval(const std::string& scope,
+                                         int interval_ms) {
+  DCHECK(mcs_client_);
+  mcs_client_->AddHeartbeatInterval(scope, interval_ms);

[Nicolas Zea, 2015/05/07 18:13:52]

This can be called from any arbitrary component right? What prevents them from
calling this before GCM has created the mcs client?

[fgorski, 2015/05/10 06:44:33]

Good point. I've added a check against delayed task controller in
GCMDriverDesktop to address the issue. Components are not meant to call stuff on
GCMClient directly, but go through the driver.

I realize that this may cause a situation that upon setting the interval to the
new value right after starting Chrome, we will reset the connection (which might
be pretty fresh), but I think this is a low price. After all next time around
the setting will come from the store.

+}
+
+void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
+  DCHECK(mcs_client_);
+  mcs_client_->RemoveHeartbeatInterval(scope);
+}
+
 void GCMClientImpl::StartCheckin() {
   // Make sure no checkin is in progress.
   if (checkin_request_.get())