[GCM] Fix gcm network change handling before connect

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 <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 180 matching lines @@
   message_received_callback_ = message_received_callback;
   message_sent_callback_ = message_sent_callback;
 
   connection_factory_->Initialize(
       base::Bind(&MCSClient::ResetStateAndBuildLoginRequest,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&MCSClient::HandlePacketFromWire,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&MCSClient::MaybeSendMessage,
                  weak_ptr_factory_.GetWeakPtr()));
-  connection_handler_ = connection_factory_->GetConnectionHandler();
 
   stream_id_out_ = 1;  // Login request is hardcoded to id 1.
 
   android_id_ = load_result->device_android_id;
   security_token_ = load_result->device_security_token;
 
   if (android_id_ == 0) {
     DVLOG(1) << "No device credentials found, assuming new client.";
     // No need to try and load RMQ data in that case.
     return;
@@ skipping 72 matching lines @@
     DCHECK(android_id);
     DCHECK(security_token);
     android_id_ = android_id;
     security_token_ = security_token;
   }
 
   DCHECK(android_id_ != 0 || restored_unackeds_server_ids_.empty());
 
   state_ = CONNECTING;
   connection_factory_->Connect();
+  connection_handler_ = connection_factory_->GetConnectionHandler();
 }
 
 void MCSClient::SendMessage(const MCSMessage& message) {
   int ttl = GetTTL(message.GetProtobuf());
   DCHECK_GE(ttl, 0);
   if (to_send_.size() > kMaxSendQueueSize) {
     NotifyMessageSendStatus(message.GetProtobuf(), QUEUE_SIZE_LIMIT_REACHED);
     return;
   }
   if (message.size() > kMaxMessageBytes) {
@@ skipping 599 matching lines @@
         reinterpret_cast<mcs_proto::DataMessageStanza*>(packet->protobuf.get());
     CollapseKey collapse_key(*data_message);
     if (collapse_key.IsValid())
       collapse_key_map_.erase(collapse_key);
   }
 
   return packet;
 }
 
 } // namespace gcm