Revert of [GCM] Start GCMChannelStatusSyncer when GCM is disabled

components/gcm_driver/gcm_channel_status_request.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_request.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "components/gcm_driver/gcm_backoff_policy.h"
 #include "net/base/escape.h"
@@ skipping 75 matching lines @@
     return false;
   }
 
   if (source->GetResponseCode() != net::HTTP_OK) {
     LOG(ERROR) << "GCM channel request failed. HTTP status: "
                << source->GetResponseCode();
     return false;
   }
 
   std::string response_string;
-  if (!source->GetResponseAsString(&response_string)) {
+  if (!source->GetResponseAsString(&response_string) ||
+      response_string.empty()) {
     LOG(ERROR) << "GCM channel response failed to be retrieved.";
     return false;
   }
 
-  // Empty response means to keep the existing values.
-  if (response_string.empty()) {
-    callback_.Run(false, false, 0);
-    return true;
-  }
-
   sync_pb::ExperimentStatusResponse response_proto;
   if (!response_proto.ParseFromString(response_string)) {
-    LOG(ERROR) << "GCM channel response failed to be parsed as proto.";
+    LOG(ERROR) << "GCM channel response failed to be parse as proto.";
     return false;
   }
 
   bool enabled = true;
   if (response_proto.experiment_size() == 1 &&
       response_proto.experiment(0).has_gcm_channel() &&
       response_proto.experiment(0).gcm_channel().has_enabled()) {
     enabled = response_proto.experiment(0).gcm_channel().enabled();
   }
 
   int poll_interval_seconds;
   if (response_proto.has_poll_interval_seconds())
     poll_interval_seconds = response_proto.poll_interval_seconds();
   else
     poll_interval_seconds = kDefaultPollIntervalSeconds;
   if (poll_interval_seconds < kMinPollIntervalSeconds)
     poll_interval_seconds = kMinPollIntervalSeconds;
 
-  callback_.Run(true, enabled, poll_interval_seconds);
+  callback_.Run(enabled, poll_interval_seconds);
 
   return true;
 }
 
 void GCMChannelStatusRequest::RetryWithBackoff(bool update_backoff) {
   if (update_backoff) {
     url_fetcher_.reset();
     backoff_entry_.InformOfRequest(false);
   }
 
   if (backoff_entry_.ShouldRejectRequest()) {
     DVLOG(1) << "Delaying GCM channel request for "
              << backoff_entry_.GetTimeUntilRelease().InMilliseconds()
              << " ms.";
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&GCMChannelStatusRequest::RetryWithBackoff,
                    weak_ptr_factory_.GetWeakPtr(),
                    false),
         backoff_entry_.GetTimeUntilRelease());
     return;
   }
 
   Start();
 }
 
 }  // namespace gcm