[GCM] Add a SelectiveAck test for midstream acks

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/message_loop/message_loop.h"
@@ skipping 752 matching lines @@
       acked_outgoing_persistent_ids,
       base::Bind(&MCSClient::OnGCMUpdateFinished,
                  weak_ptr_factory_.GetWeakPtr()));
 
   HandleServerConfirmedReceipt(last_stream_id_received);
 }
 
 void MCSClient::HandleSelectiveAck(const PersistentIdList& id_list) {
   std::set<PersistentId> remaining_ids(id_list.begin(), id_list.end());
 
-  StreamId last_stream_id_received = -1;
+  StreamId last_stream_id_received = 0;
 
   // First check the to_resend_ queue. Acknowledgments are always contiguous,
   // so if there's a pending message that hasn't been acked, all newer messages
   // must also be unacked.
   while(!to_resend_.empty() && !remaining_ids.empty()) {
     const MCSPacketInternal& outgoing_packet = to_resend_.front();
     if (remaining_ids.count(outgoing_packet->persistent_id) == 0)
       break;  // Newer message must be unacked too.
     remaining_ids.erase(outgoing_packet->persistent_id);
     NotifyMessageSendStatus(*outgoing_packet->protobuf, SENT);
@@ skipping 48 matching lines @@
       base::Bind(&MCSClient::OnGCMUpdateFinished,
                  weak_ptr_factory_.GetWeakPtr()));
 
   // Resend any remaining outgoing messages, as they were not received by the
   // server.
   DVLOG(1) << "Resending " << to_resend_.size() << " messages.";
   while (!to_resend_.empty()) {
     to_send_.push_front(to_resend_.back());
     to_resend_.pop_back();
   }
+  base::MessageLoop::current()->PostTask(

[fgorski, 2014/07/14 20:59:35]

Add comment why this is added.

[Nicolas Zea, 2014/07/14 21:16:17]

The above comment applies to this. We're resending any remaining outgoing
messages. This call should have been there before.

[fgorski, 2014/07/15 04:07:58]

Fair enough, comment was cut by the diff view I was using.

+      FROM_HERE,
+      base::Bind(&MCSClient::MaybeSendMessage,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 void MCSClient::HandleServerConfirmedReceipt(StreamId device_stream_id) {
   PersistentIdList acked_incoming_ids;
   for (std::map<StreamId, PersistentIdList>::iterator iter =
            acked_server_ids_.begin();
        iter != acked_server_ids_.end() &&
            iter->first <= device_stream_id;) {
     acked_incoming_ids.insert(acked_incoming_ids.end(),
                               iter->second.begin(),
@@ skipping 49 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