[GCM] Start GCMChannelStatusSyncer when GCM is disabled

We need to start GCMChannelStatusSyncer when GCM is disabled in order
to poll the server to find out when it is reenabled.

Also if server returns empty response, we should not treat it as error
and trigger the backoff logic.

BUG=423415
TEST=new tests added

Committed: https://crrev.com/9e9dd3b7798b3500d70941af04b1325ef9a0b544
Cr-Commit-Position: refs/heads/master@{#299518}

R=fgorski@chromium.org

Review URL: https://codereview.chromium.org/653843003

Cr-Commit-Position: refs/heads/master@{#299854}

1 files changed, 10 insertions, 1 deletions

diff --git a/components/gcm_driver/gcm_channel_status_syncer.h b/components/gcm_driver/gcm_channel_status_syncer.h
index b4641af..0b7ba3f 100644
--- a/components/gcm_driver/gcm_channel_status_syncer.h
+++ b/components/gcm_driver/gcm_channel_status_syncer.h
@@ -59,7 +59,9 @@ class GCMChannelStatusSyncer {
 
  private:
   // Called when a request is completed.
-  void OnRequestCompleted(bool enabled, int poll_interval_seconds);
+  void OnRequestCompleted(bool update_received,
+                          bool enabled,
+                          int poll_interval_seconds);
 
   // Schedules next request to start after appropriate delay.
   void ScheduleRequest();
@@ -80,10 +82,17 @@ class GCMChannelStatusSyncer {
   scoped_refptr<net::URLRequestContextGetter> request_context_;
   scoped_ptr<GCMChannelStatusRequest> request_;
 
+  bool started_;
   bool gcm_enabled_;
   int poll_interval_seconds_;
   base::Time last_check_time_;
 
+  // If non-zero, |poll_interval_seconds_| is overriden by the command line
+  // options for testing purpose. Each time when the custom poll interval is
+  // used, this count is subtracted by one. When it reaches zero, the default
+  // poll interval will be used instead.
+  int custom_poll_interval_use_count_;
+
   // The flag that indicates if the delay, including fuzzing variation and poll
   // interval, is removed for testing purpose.
   bool delay_removed_for_testing_;