Revert of [GCM] Adding periodic checkin controlled by G-services settings

google_apis/gcm/gcm_client_impl.cc

 // Copyright 2013 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 "google_apis/gcm/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/time/default_clock.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/engine/checkin_request.h"
 #include "google_apis/gcm/engine/connection_factory_impl.h"
 #include "google_apis/gcm/engine/gcm_store_impl.h"
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/http/http_network_session.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 182 matching lines @@
 
   if (!result->success) {
     ResetState();
     return;
   }
 
   registrations_ = result->registrations;
   device_checkin_info_.android_id = result->device_android_id;
   device_checkin_info_.secret = result->device_security_token;
   base::Time last_checkin_time = result->last_checkin_time;
-  gservices_settings_ = result->gservices_settings;
-  gservices_digest_ = result->gservices_digest;
   InitializeMCSClient(result.Pass());
 
   if (device_checkin_info_.IsValid()) {
     SchedulePeriodicCheckin(last_checkin_time);
     OnReady();
     return;
   }
 
   state_ = INITIAL_DEVICE_CHECKIN;
   device_checkin_info_.Reset();
@@ skipping 52 matching lines @@
   mcs_client_->Login(device_checkin_info_.android_id,
                      device_checkin_info_.secret);
 }
 
 void GCMClientImpl::ResetState() {
   state_ = UNINITIALIZED;
   // TODO(fgorski): reset all of the necessart objects and start over.
 }
 
 void GCMClientImpl::StartCheckin() {
-  CheckinRequest::RequestInfo request_info(
-    device_checkin_info_.android_id,
-    device_checkin_info_.secret,
-    gservices_digest_,
-    account_ids_,
-    chrome_build_proto_);
   checkin_request_.reset(
-      new CheckinRequest(request_info,
+      new CheckinRequest(base::Bind(&GCMClientImpl::OnCheckinCompleted,
+                                    weak_ptr_factory_.GetWeakPtr()),
                          kDefaultBackoffPolicy,
-                         base::Bind(&GCMClientImpl::OnCheckinCompleted,
-                                    weak_ptr_factory_.GetWeakPtr()),
+                         chrome_build_proto_,
+                         device_checkin_info_.android_id,
+                         device_checkin_info_.secret,
+                         account_ids_,
                          url_request_context_getter_));
   checkin_request_->Start();
 }
 
-void GCMClientImpl::OnCheckinCompleted(
-    const checkin_proto::AndroidCheckinResponse& checkin_response) {
+void GCMClientImpl::OnCheckinCompleted(uint64 android_id,
+                                       uint64 security_token) {
   checkin_request_.reset();
 
-  if (!checkin_response.has_android_id() ||
-      !checkin_response.has_security_token()) {
-    // TODO(fgorski): I don't think a retry here will help, we should probably
+  CheckinInfo checkin_info;
+  checkin_info.android_id = android_id;
+  checkin_info.secret = security_token;
+
+  if (!checkin_info.IsValid()) {
+    // TODO(fgorski): I don't think a retry here will help, we should probalby
     // start over. By checking in with (0, 0).
     return;
   }
 
-  CheckinInfo checkin_info;
-  checkin_info.android_id = checkin_response.android_id();
-  checkin_info.secret = checkin_response.security_token();
-
   if (state_ == INITIAL_DEVICE_CHECKIN) {
     OnFirstTimeDeviceCheckinCompleted(checkin_info);
   } else {
     // checkin_info is not expected to change after a periodic checkin as it
     // would invalidate the registratoin IDs.
     DCHECK_EQ(READY, state_);
     DCHECK_EQ(device_checkin_info_.android_id, checkin_info.android_id);
     DCHECK_EQ(device_checkin_info_.secret, checkin_info.secret);
   }
 
   if (device_checkin_info_.IsValid()) {
     base::Time last_checkin_time = clock_->Now();
     gcm_store_->SetLastCheckinTime(
         last_checkin_time,
         base::Bind(&GCMClientImpl::SetLastCheckinTimeCallback,
                    weak_ptr_factory_.GetWeakPtr()));
-    UpdateGServicesSettings(checkin_response);
     SchedulePeriodicCheckin(last_checkin_time);
   }
 }
 
 void GCMClientImpl::SchedulePeriodicCheckin(
     const base::Time& last_checkin_time) {
   base::TimeDelta time_to_next_checkin = last_checkin_time +
       base::TimeDelta::FromSeconds(kDefaultCheckinInterval) - clock_->Now();
   if (time_to_next_checkin < base::TimeDelta::FromSeconds(0L))
     time_to_next_checkin = base::TimeDelta::FromSeconds(0L);
@@ skipping 347 matching lines @@
       send_error_details.additional_data.find(kSendErrorMessageIdKey);
   if (iter != send_error_details.additional_data.end()) {
     send_error_details.message_id = iter->second;
     send_error_details.additional_data.erase(iter);
   }
 
   delegate_->OnMessageSendError(data_message_stanza.category(),
                                 send_error_details);
 }
 
-void GCMClientImpl::UpdateGServicesSettings(
-    const checkin_proto::AndroidCheckinResponse& checkin_response) {
-  if (!checkin_response.has_digest() ||
-      checkin_response.digest() == gservices_digest_) {
-    return;
-  }
-
-  gservices_digest_ = checkin_response.digest();
-  gservices_settings_.clear();
-
-  for (int i = 0; i < checkin_response.setting_size(); ++i) {
-    std::string name = checkin_response.setting(i).name();
-    std::string value = checkin_response.setting(i).value();
-    gservices_settings_[name] = value;
-  }
-
-  gcm_store_->SetGServicesSettings(
-      gservices_settings_,
-      gservices_digest_,
-      base::Bind(&GCMClientImpl::UpdateGServicesSettingsCallback,
-                 weak_ptr_factory_.GetWeakPtr()));
-}
-
-void GCMClientImpl::UpdateGServicesSettingsCallback(bool success) {
-  DCHECK(success);
-}
-
 }  // namespace gcm