Revert of [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/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 93 matching lines @@
     return;
 
   ScheduleRequest();
 }
 
 void GCMChannelStatusSyncer::Stop() {
   request_.reset();
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
-void GCMChannelStatusSyncer::OnRequestCompleted(bool update_received,
-                                                bool enabled,
+void GCMChannelStatusSyncer::OnRequestCompleted(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 (update_received) {
-    if (gcm_enabled_ != enabled) {
-      gcm_enabled_ = enabled;
-      prefs_->SetBoolean(kGCMChannelStatus, enabled);
-      if (gcm_enabled_)
-        driver_->Enable();
-      else
-        driver_->Disable();
-    }
+  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 32 matching lines @@
     delay_seconds = kFirstTimeDelaySeconds;
   } else {
     // Otherwise, add a fuzzing variation to the delay.
     delay_seconds += base::RandInt(0, kGCMChannelRequestTimeJitterSeconds);
   }
 
   return base::TimeDelta::FromSeconds(delay_seconds);
 }
 
 }  // namespace gcm