[GCM] Start GCMChannelStatusSyncer when GCM is disabled

components/gcm_driver/gcm_channel_status_syncer.cc

 // 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.
 
 #include "components/gcm_driver/gcm_channel_status_syncer.h"
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "components/gcm_driver/gcm_channel_status_request.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
 namespace gcm {
 
 namespace {
 
 // The GCM channel's enabled state.
 const char kGCMChannelStatus[] = "gcm.channel_status";
 
 // The GCM channel's polling interval (in seconds).
 const char kGCMChannelPollIntervalSeconds[] = "gcm.poll_interval";
 
 // Last time when checking with the GCM channel status server is done.
 const char kGCMChannelLastCheckTime[] = "gcm.check_time";
 
+// Override the default poll interval for testing purpose.
+const char kCustomPollIntervalMinutes[] = "gcm-channel-poll-interval";
+
 // A small delay to avoid sending request at browser startup time for first-time
 // request.
 const int kFirstTimeDelaySeconds = 1 * 60;  // 1 minute.
 
 // The fuzzing variation added to the polling delay.
 const int kGCMChannelRequestTimeJitterSeconds = 15 * 60;  // 15 minues.
 
 }  // namespace
 
 // static
@@ skipping 32 matching lines @@
     PrefService* prefs,
     const std::string& channel_status_request_url,
     const std::string& user_agent,
     const scoped_refptr<net::URLRequestContextGetter>& request_context)
     : driver_(driver),
       prefs_(prefs),
       channel_status_request_url_(channel_status_request_url),
       user_agent_(user_agent),
       request_context_(request_context),
       gcm_enabled_(true),
+      jitter_enabled_(true),
       poll_interval_seconds_(
           GCMChannelStatusRequest::default_poll_interval_seconds()),
       delay_removed_for_testing_(false),
       weak_ptr_factory_(this) {
   gcm_enabled_ = prefs_->GetBoolean(kGCMChannelStatus);
   poll_interval_seconds_ = prefs_->GetInteger(kGCMChannelPollIntervalSeconds);
   if (poll_interval_seconds_ <
       GCMChannelStatusRequest::min_poll_interval_seconds()) {
     poll_interval_seconds_ =
         GCMChannelStatusRequest::min_poll_interval_seconds();
   }
+  if (CommandLine::ForCurrentProcess()->HasSwitch(kCustomPollIntervalMinutes)) {
+    std::string value(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+        kCustomPollIntervalMinutes));
+    int minutes = 0;
+    if (base::StringToInt(value, &minutes)) {
+      poll_interval_seconds_ = minutes * 60;

[fgorski, 2014/10/15 17:01:52]

we should make sure it is >0, right?

+      // The fuzzing variation is off when the custom interval is used.
+      jitter_enabled_ = false;
+    }
+  }
   last_check_time_ = base::Time::FromInternalValue(
       prefs_->GetInt64(kGCMChannelLastCheckTime));
 }
 
 GCMChannelStatusSyncer::~GCMChannelStatusSyncer() {
 }
 
 void GCMChannelStatusSyncer::EnsureStarted() {
   // Bail out if the request is already scheduled or started.
   if (weak_ptr_factory_.HasWeakPtrs() || request_)
     return;
 
   ScheduleRequest();
 }
 
 void GCMChannelStatusSyncer::Stop() {
   request_.reset();
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
-void GCMChannelStatusSyncer::OnRequestCompleted(bool enabled,
+void GCMChannelStatusSyncer::OnRequestCompleted(bool update_received,
+                                                bool enabled,
                                                 int poll_interval_seconds) {
   DCHECK(request_);
   request_.reset();
 
   // Persist the current time as the last request complete time.
   last_check_time_ = base::Time::Now();
   prefs_->SetInt64(kGCMChannelLastCheckTime,
                    last_check_time_.ToInternalValue());
 
-  if (gcm_enabled_ != enabled) {
-    gcm_enabled_ = enabled;
-    prefs_->SetBoolean(kGCMChannelStatus, enabled);
-    if (gcm_enabled_)
-      driver_->Enable();
-    else
-      driver_->Disable();
-  }
+  if (update_received) {
+    if (gcm_enabled_ != enabled) {
+      gcm_enabled_ = enabled;
+      prefs_->SetBoolean(kGCMChannelStatus, enabled);
+      if (gcm_enabled_)
+        driver_->Enable();
+      else
+        driver_->Disable();
+    }
 
-  DCHECK_GE(poll_interval_seconds,
-            GCMChannelStatusRequest::min_poll_interval_seconds());
-  if (poll_interval_seconds_ != poll_interval_seconds) {
-    poll_interval_seconds_ = poll_interval_seconds;
-    prefs_->SetInteger(kGCMChannelPollIntervalSeconds, poll_interval_seconds_);
+    DCHECK_GE(poll_interval_seconds,
+              GCMChannelStatusRequest::min_poll_interval_seconds());
+    if (poll_interval_seconds_ != poll_interval_seconds) {
+      poll_interval_seconds_ = poll_interval_seconds;
+      prefs_->SetInteger(kGCMChannelPollIntervalSeconds,
+                         poll_interval_seconds_);
+    }
   }
 
   ScheduleRequest();
 }
 
 void GCMChannelStatusSyncer::ScheduleRequest() {
   current_request_delay_interval_ = GetRequestDelayInterval();
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&GCMChannelStatusSyncer::StartRequest,
@@ skipping 25 matching lines @@
   if (delay_seconds < 0)
     delay_seconds = 0;
 
   if (last_check_time_.is_null()) {
     // For the first-time request, add a small delay to avoid sending request at
     // browser startup time.
     DCHECK(!delay_seconds);
     delay_seconds = kFirstTimeDelaySeconds;
   } else {
     // Otherwise, add a fuzzing variation to the delay.
-    delay_seconds += base::RandInt(0, kGCMChannelRequestTimeJitterSeconds);
+    if (jitter_enabled_)
+      delay_seconds += base::RandInt(0, kGCMChannelRequestTimeJitterSeconds);
   }
 
   return base::TimeDelta::FromSeconds(delay_seconds);
 }
 
 }  // namespace gcm