[GCM] Fix gcm login to properly identify chrome

google_apis/gcm/base/mcs_util.cc

Index: google_apis/gcm/base/mcs_util.cc
diff --git a/google_apis/gcm/base/mcs_util.cc b/google_apis/gcm/base/mcs_util.cc
index 581b1eaba5e6c1267c555b809c112caff9eeab5d..16ded41be595733d385ebb121961ac40719ad663 100644
--- a/google_apis/gcm/base/mcs_util.cc
+++ b/google_apis/gcm/base/mcs_util.cc
@@ -39,8 +39,7 @@ const char* kProtoNames[] = {
 COMPILE_ASSERT(arraysize(kProtoNames) == kNumProtoTypes,
                ProtoNamesMustIncludeAllTags);
 
-// TODO(zea): replace these with proper values.
-const char kLoginId[] = "login-1";
+const char kLoginId[] = "chrome-";
 const char kLoginDomain[] = "mcs.android.com";
 const char kLoginDeviceIdPrefix[] = "android-";
 const char kLoginSettingDefaultName[] = "new_vc";
@@ -55,6 +54,7 @@ const int kMaxTTLSeconds = 4 * 7 * 24 * 60 * 60;  // 4 weeks.
 scoped_ptr<mcs_proto::LoginRequest> BuildLoginRequest(
     uint64 auth_id,
     uint64 auth_token,
+    const std::string& version_string,
     const std::vector<int64>& user_serial_numbers) {
   // Create a hex encoded auth id for the device id field.
   std::string auth_id_hex;
@@ -66,12 +66,10 @@ scoped_ptr<mcs_proto::LoginRequest> BuildLoginRequest(
   scoped_ptr<mcs_proto::LoginRequest> login_request(
       new mcs_proto::LoginRequest());
 
-  // TODO(zea): set better values.
-  login_request->set_account_id(1000000);
   login_request->set_adaptive_heartbeat(false);
   login_request->set_auth_service(mcs_proto::LoginRequest::ANDROID_ID);
   login_request->set_auth_token(auth_token_str);
-  login_request->set_id(kLoginId);
+  login_request->set_id(kLoginId + version_string);

[jianli, 2014/02/19 00:08:26]

If version_string is empty, we will set id to "chrome-", right? Just want to
confirm it.

[Nicolas Zea, 2014/02/19 18:40:28]

Yep

   login_request->set_domain(kLoginDomain);
   login_request->set_device_id(kLoginDeviceIdPrefix + auth_id_hex);
   login_request->set_network_type(1);