[GCM] Fix mcs_probe credential handling

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 186 matching lines @@
   DCHECK(android_id_ == 0 || android_id_ == android_id);
   DCHECK(security_token_ == 0 || security_token_ == security_token);
 
   if (android_id != android_id_ && security_token != security_token_) {
     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();
-  DCHECK(restored_unackeds_server_ids_.empty());
 }
 
 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 518 matching lines @@
   const mcs_proto::DataMessageStanza* data_message_stanza =
       reinterpret_cast<const mcs_proto::DataMessageStanza*>(&protobuf);
   message_sent_callback_.Run(
       data_message_stanza->device_user_id(),
       data_message_stanza->category(),
       data_message_stanza->id(),
       status);
 }
 
 } // namespace gcm