[GCM] Start GCMChannelStatusSyncer when GCM is disabled

components/gcm_driver/gcm_channel_status_syncer.h

 // Copyright 2014 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 COMPONENTS_GCM_DRIVER_GCM_CHANNEL_STATUS_SYNCER_H_
 #define COMPONENTS_GCM_DRIVER_GCM_CHANNEL_STATUS_SYNCER_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 41 matching lines @@
   void set_delay_removed_for_testing(bool delay_removed) {
     delay_removed_for_testing_ = delay_removed;
   }
   base::TimeDelta current_request_delay_interval() const {
     return current_request_delay_interval_;
   }
   static int first_time_delay_seconds();
 
  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();
 
   // Creates and starts a request immediately.
   void StartRequest();
 
   // Computes and returns a delay with the fuzzing variation added if needed,
   // after which the request could start.
   base::TimeDelta GetRequestDelayInterval() const;
 
   // GCMDriver owns GCMChannelStatusSyncer instance.
   GCMDriver* driver_;
   PrefService* prefs_;
   const std::string channel_status_request_url_;
   const std::string user_agent_;
 
   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_;
 
   // Tracked for testing purpose.
   base::TimeDelta current_request_delay_interval_;
 
   // Used to pass a weak pointer to a task.
   base::WeakPtrFactory<GCMChannelStatusSyncer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMChannelStatusSyncer);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_CHANNEL_STATUS_SYNCER_H_