[GCM] Support actual check-in in mcs_probe

google_apis/gcm/tools/mcs_probe.cc

Index: google_apis/gcm/tools/mcs_probe.cc
diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc
index 3170aa28676901e3c884af4c458e001b045bde2e..5dcf70c4a10fdab865cdf4430bb6c52c6ea8b1b3 100644
--- a/google_apis/gcm/tools/mcs_probe.cc
+++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -24,6 +24,7 @@
 #include "base/values.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"
@@ -50,6 +51,10 @@
 namespace gcm {
 namespace {
 
+// Default values used to communicate with the check-in server.
+const char kChromeVersion[] = "Test Chrome Version";

[fgorski, 2014/01/09 22:23:47]

Should we call it "Chrome MCS Probe"?
It would be clear what to look for if someone sees that in the logs and asks
questions.

[jianli, 2014/01/09 23:37:05]

Done.

+const int64 kUserSerialNumber = 1;

[fgorski, 2014/01/09 22:23:47]

This should be unique within the device, so should probably take the
UserSerialNumber from the store.

Unless of course MCS Probe will never be used in a multi user scenario... (We
can make that kind of change later).

[jianli, 2014/01/09 23:37:05]

For now, mcs_probe only supports single user scenario. We will add multi-user
support later.

+
 // The default server to communicate with.
 const char kMCSServerHost[] = "mtalk.google.com";
 const uint16 kMCSServerPort = 5228;
@@ -166,12 +171,15 @@ class MCSProbe {
   uint64 secret() const { return secret_; }
 
  private:
+  void CheckIn();
   void InitializeNetworkState();
   void BuildNetworkSession();
+  void LoginMCSClient();
 
   void InitializationCallback(bool success,
                               uint64 restored_android_id,
                               uint64 restored_security_token);
+  void OnCheckInCompleted(uint64 android_id, uint64 secret);
 
   base::DefaultClock clock_;
 
@@ -201,6 +209,7 @@ class MCSProbe {
 
   scoped_ptr<GCMStore> gcm_store_;
   scoped_ptr<MCSClient> mcs_client_;
+  scoped_ptr<CheckinRequest> checkin_request_;
 
   scoped_ptr<ConnectionFactoryImpl> connection_factory_;
 
@@ -340,11 +349,60 @@ void MCSProbe::InitializationCallback(bool success,
                                       uint64 restored_security_token) {
   LOG(INFO) << "Initialization " << (success ? "success!" : "failure!");
   if (restored_android_id && restored_security_token) {
+    LOG(INFO) << "Restored device check-in info.";
     android_id_ = restored_android_id;
     secret_ = restored_security_token;
   }
-  if (success)
-    mcs_client_->Login(android_id_, secret_);
+  if (!success)
+    return;
+
+  if (!android_id_ || !secret_) {
+    CheckIn();
+    return;
+  }
+
+  LoginMCSClient();
+}
+
+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);
+  checkin_request_.reset(new CheckinRequest(
+      base::Bind(&MCSProbe::OnCheckInCompleted, base::Unretained(this)),
+      chrome_build_proto,
+      kUserSerialNumber,
+      0,
+      0,
+      url_request_context_getter_.get()));
+  checkin_request_->Start();
+}
+
+void MCSProbe::OnCheckInCompleted(uint64 android_id, uint64 secret) {
+  LOG(INFO) << "Check-in request completion "
+            << (android_id ? "success!" : "failure!");
+  if (!android_id || !secret)
+    return;
+  android_id_ = android_id;
+  secret_ = secret;

[fgorski, 2014/01/09 22:23:47]

I think you should persist android_id and secret, and I am not clear if that
happens.

MCS Probe could have a switch to start fresh and wipe the db.

[jianli, 2014/01/09 23:37:05]

This has already been taken care of in MCSClient::Login.
I don't think we need a switch. You can just run "rm -rf gcm_store" to do it.

+
+  // We have to wait a while to talk with MCS server due to potential
+  // propagation delay.
+  const int kDelayMS = 10000;
+  LOG(INFO) << "Delaying MCS login for " << kDelayMS << "MS ...";
+  base::MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&MCSProbe::LoginMCSClient, base::Unretained(this)),
+      base::TimeDelta::FromMilliseconds(kDelayMS));
+}
+
+void MCSProbe::LoginMCSClient() {
+  LOG(INFO) << "MCS login initiated.";
+  mcs_client_->Login(android_id_, secret_);
 }
 
 int MCSProbeMain(int argc, char* argv[]) {