[GCM] Fix gcm login to properly identify chrome

google_apis/gcm/engine/mcs_client.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/engine/mcs_client.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 67 matching lines @@
 
   // The protobuf of the message itself.
   MCSProto protobuf;
 };
 
 ReliablePacketInfo::ReliablePacketInfo()
   : stream_id(0), tag(0) {
 }
 ReliablePacketInfo::~ReliablePacketInfo() {}
 
-MCSClient::MCSClient(base::Clock* clock,
+MCSClient::MCSClient(const std::string& version_string,
+                     base::Clock* clock,
                      ConnectionFactory* connection_factory,
                      GCMStore* gcm_store)
-    : clock_(clock),
+    : version_string_(version_string),
+      clock_(clock),
       state_(UNINITIALIZED),
       android_id_(0),
       security_token_(0),
       connection_factory_(connection_factory),
       connection_handler_(NULL),
       last_device_to_server_stream_id_received_(0),
       last_server_to_device_stream_id_received_(0),
       stream_id_out_(0),
       stream_id_in_(0),
       gcm_store_(gcm_store),
@@ skipping 188 matching lines @@
            acked_server_ids_.begin();
        iter != acked_server_ids_.end(); ++iter) {
     restored_unackeds_server_ids_.insert(restored_unackeds_server_ids_.end(),
                                          iter->second.begin(),
                                          iter->second.end());
   }
   acked_server_ids_.clear();
 
   // Then build the request, consuming all pending acknowledgments.
   request->Swap(BuildLoginRequest(
-      android_id_, security_token_, user_serial_numbers_).get());
+      android_id_,
+      security_token_,
+      version_string_,
+      user_serial_numbers_).get());
   for (PersistentIdList::const_iterator iter =
            restored_unackeds_server_ids_.begin();
        iter != restored_unackeds_server_ids_.end(); ++iter) {
     request->add_received_persistent_id(*iter);
   }
   acked_server_ids_[stream_id_out_] = restored_unackeds_server_ids_;
   restored_unackeds_server_ids_.clear();
 
   // Push all unacknowledged messages to front of send queue. No need to save
   // to RMQ, as all messages that reach this point should already have been
@@ skipping 442 matching lines @@
       data_message_stanza->category(),
       data_message_stanza->id(),
       status);
 }
 
 void MCSClient::SetGCMStoreForTesting(GCMStore* gcm_store) {
   gcm_store_ = gcm_store;
 }
 
 } // namespace gcm