Revert of [GCM] Adding basic G-services handling

google_apis/gcm/tools/mcs_probe.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.
 //
 // A standalone tool for testing MCS connections and the MCS client on their
 // own.
 
 #include <cstddef>
 #include <cstdio>
 #include <string>
@@ skipping 192 matching lines @@
   uint64 secret() const { return secret_; }
 
  private:
   void CheckIn();
   void InitializeNetworkState();
   void BuildNetworkSession();
 
   void LoadCallback(scoped_ptr<GCMStore::LoadResult> load_result);
   void UpdateCallback(bool success);
   void ErrorCallback();
-  void OnCheckInCompleted(
-      const checkin_proto::AndroidCheckinResponse& checkin_response);
+  void OnCheckInCompleted(uint64 android_id, uint64 secret);
   void StartMCSLogin();
 
   base::DefaultClock clock_;
 
   CommandLine command_line_;
 
   base::FilePath gcm_store_path_;
   uint64 android_id_;
   uint64 secret_;
   std::string server_host_;
@@ skipping 192 matching lines @@
 }
 
 void MCSProbe::CheckIn() {
   LOG(INFO) << "Check-in request initiated.";
   checkin_proto::ChromeBuildProto chrome_build_proto;
   chrome_build_proto.set_platform(
       checkin_proto::ChromeBuildProto::PLATFORM_LINUX);
   chrome_build_proto.set_channel(
       checkin_proto::ChromeBuildProto::CHANNEL_CANARY);
   chrome_build_proto.set_chrome_version(kChromeVersion);
-
-  CheckinRequest::RequestInfo request_info(
-      0, 0, std::string(), std::vector<std::string>(), chrome_build_proto);
-
   checkin_request_.reset(new CheckinRequest(
-      request_info,
+      base::Bind(&MCSProbe::OnCheckInCompleted, base::Unretained(this)),
       kDefaultBackoffPolicy,
-      base::Bind(&MCSProbe::OnCheckInCompleted, base::Unretained(this)),
+      chrome_build_proto,
+      0,
+      0,
+      std::vector<std::string>(),
       url_request_context_getter_.get()));
   checkin_request_->Start();
 }
 
-void MCSProbe::OnCheckInCompleted(
-    const checkin_proto::AndroidCheckinResponse& checkin_response) {
-  bool success = checkin_response.has_android_id() &&
-                 checkin_response.android_id() != 0UL &&
-                 checkin_response.has_security_token() &&
-                 checkin_response.security_token() != 0UL;
+void MCSProbe::OnCheckInCompleted(uint64 android_id, uint64 secret) {
   LOG(INFO) << "Check-in request completion "
-            << (success ? "success!" : "failure!");
-
-  if (!success)
+            << (android_id ? "success!" : "failure!");
+  if (!android_id || !secret)
     return;
-
-  android_id_ = checkin_response.android_id();
-  secret_ = checkin_response.security_token();
+  android_id_ = android_id;
+  secret_ = secret;
 
   gcm_store_->SetDeviceCredentials(android_id_,
                                    secret_,
                                    base::Bind(&MCSProbe::UpdateCallback,
                                               base::Unretained(this)));
 
   StartMCSLogin();
 }
 
 void MCSProbe::StartMCSLogin() {
@@ skipping 27 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }