[GCM] Fix mcs_probe credential 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 164 matching lines @@
 
   uint64 android_id() const { return android_id_; }
   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(uint64 android_id, uint64 secret);
 
   base::DefaultClock clock_;
 
   CommandLine command_line_;
 
   base::FilePath gcm_store_path_;
   uint64 android_id_;
   uint64 secret_;
@@ skipping 80 matching lines @@
                                   connection_factory_.get(),
                                   gcm_store_.get()));
   run_loop_.reset(new base::RunLoop());
   gcm_store_->Load(base::Bind(&MCSProbe::LoadCallback,
                               base::Unretained(this)));
   run_loop_->Run();
 }
 
 void MCSProbe::LoadCallback(scoped_ptr<GCMStore::LoadResult> load_result) {
   DCHECK(load_result->success);
-  android_id_ = load_result->device_android_id;
-  secret_ = load_result->device_security_token;
+  if (android_id_ != 0 && secret_ != 0) {
+    DVLOG(1) << "Presetting MCS id " << android_id_;
+    load_result->device_android_id = android_id_;
+    load_result->device_security_token = secret_;
+    gcm_store_->SetDeviceCredentials(android_id_,

[jianli, 2014/01/25 01:00:28]

Should we persist the check-in info when the check-in completes
(MCSProbe::OnCheckInCompleted)?

[Nicolas Zea, 2014/01/25 01:04:14]

Good point, done.

+                                     secret_,
+                                     base::Bind(&MCSProbe::UpdateCallback,
+                                                base::Unretained(this)));
+  } else {
+    android_id_ = load_result->device_android_id;
+    secret_ = load_result->device_security_token;
+    DVLOG(1) << "Loaded MCS id " << android_id_;
+  }
   mcs_client_->Initialize(
       base::Bind(&MCSProbe::ErrorCallback, base::Unretained(this)),
       base::Bind(&MessageReceivedCallback),
       base::Bind(&MessageSentCallback),
       load_result.Pass());
 
   if (!android_id_ || !secret_) {
+    DVLOG(1) << "Checkin to generate new MCS credentials.";
     CheckIn();
     return;
   }
 
   mcs_client_->Login(android_id_, secret_);
 }
 
+void MCSProbe::UpdateCallback(bool success) {
+}
+
 void MCSProbe::InitializeNetworkState() {
   FILE* log_file = NULL;
   if (command_line_.HasSwitch(kLogFileSwitch)) {
     base::FilePath log_path = command_line_.GetSwitchValuePath(kLogFileSwitch);
 #if defined(OS_WIN)
     log_file = _wfopen(log_path.value().c_str(), L"w");
 #elif defined(OS_POSIX)
     log_file = fopen(log_path.value().c_str(), "w");
 #endif
   }
@@ skipping 112 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }