[GCM] Fix gcm login to properly identify chrome

google_apis/gcm/engine/connection_handler_impl.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/connection_handler_impl.h"
 
 #include "base/message_loop/message_loop.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/base/socket_stream.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
 
 using namespace google::protobuf::io;
 
 namespace gcm {
 
 namespace {
 
 // # of bytes a MCS version packet consumes.
 const int kVersionPacketLen = 1;
 // # of bytes a tag packet consumes.
 const int kTagPacketLen = 1;
 // Max # of bytes a length packet consumes.
 const int kSizePacketLenMin = 1;
 const int kSizePacketLenMax = 2;
 
 // The current MCS protocol version.
-// TODO(zea): bump to 41 once the server supports it.
-const int kMCSVersion = 38;
+const int kMCSVersion = 41;
 
 }  // namespace
 
 ConnectionHandlerImpl::ConnectionHandlerImpl(
     base::TimeDelta read_timeout,
     const ProtoReceivedCallback& read_callback,
     const ProtoSentCallback& write_callback,
     const ConnectionChangedCallback& connection_callback)
     : read_timeout_(read_timeout),
       socket_(NULL),
@@ skipping 214 matching lines @@
       NOTREACHED();
   }
 }
 
 void ConnectionHandlerImpl::OnGotVersion() {
   uint8 version = 0;
   {
     CodedInputStream coded_input_stream(input_stream_.get());
     coded_input_stream.ReadRaw(&version, 1);
   }
-  if (version < kMCSVersion) {
+  // TODO(zea): remove this when the server is ready.
+  if (version < kMCSVersion && version != 38) {

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

Why do we need to check for this? What's current version returned from the
server? It seems that we will let through version 38. What if version 39?

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

A server bug that hasn't been fixed yet results in returning 38. It should in
fact return 41 or newer.

     LOG(ERROR) << "Invalid GCM version response: " << static_cast<int>(version);
     connection_callback_.Run(net::ERR_FAILED);
     return;
   }
 
   input_stream_->RebuildBuffer();
 
   // Process the LoginResponse message tag.
   OnGotMessageTag();
 }
@@ skipping 124 matching lines @@
   read_timeout_timer_.Stop();
   if (socket_)
     socket_->Disconnect();
   socket_ = NULL;
   input_stream_.reset();
   output_stream_.reset();
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace gcm