Fix ASSERT in JingleMessage::OrderedMessageQueue.

remoting/protocol/jingle_session.cc

 // Copyright (c) 2012 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 "remoting/protocol/jingle_session.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <memory>
@@ skipping 97 matching lines @@
 class JingleSession::OrderedMessageQueue {
  public:
   OrderedMessageQueue() {}
   ~OrderedMessageQueue() {}
 
   // Returns the list of messages ordered by their sequential IDs.
   std::vector<PendingMessage> OnIncomingMessage(
       const std::string& id,
       PendingMessage&& pending_message);
 
+  // Sets the initial ID of the session initiate message.
+  void setInitialId(const std::string& id);

[Sergey Ulanov, 2017/07/05 18:00:14]

SetInitialiId() please

[kelvinp, 2017/07/05 22:29:40]

Done.

+
  private:
   // Implements an ordered list by using map with the |sequence_id| as the key,
   // so that |queue_| is always sorted by |sequence_id|.
   std::map<int, PendingMessage> queue_;
 
   int next_incoming_ = kAny;
 
   DISALLOW_COPY_AND_ASSIGN(OrderedMessageQueue);
 };
 
+void JingleSession::OrderedMessageQueue::setInitialId(const std::string& id) {

[Sergey Ulanov, 2017/07/05 18:00:14]

Put this after OnIncomingMessage() so the order matches the order in class
declaration.

[kelvinp, 2017/07/05 22:29:41]

Done.

+  int current = GetSequentialId(id);
+  if (current != kInvalid)
+    next_incoming_ = current + 1;
+}
+
 std::vector<JingleSession::PendingMessage>
 JingleSession::OrderedMessageQueue::OnIncomingMessage(
     const std::string& id,
     JingleSession::PendingMessage&& message) {
   std::vector<JingleSession::PendingMessage> result;
   int current = GetSequentialId(id);
   // If there is no sequencing order encoded in the id, just return the
   // message.
   if (current == kInvalid) {
     result.push_back(std::move(message));
@@ skipping 79 matching lines @@
   // Delay sending session-initiate message to ensure SessionPlugin can be
   // attached before the message.
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
       base::Bind(&JingleSession::SendSessionInitiateMessage,
                  weak_factory_.GetWeakPtr()));
 
   SetState(CONNECTING);
 }
 
 void JingleSession::InitializeIncomingConnection(
+    const std::string& id,

[Sergey Ulanov, 2017/07/05 18:00:14]

call it message_id.

[kelvinp, 2017/07/05 22:29:40]

Done.

     const JingleMessage& initiate_message,
     std::unique_ptr<Authenticator> authenticator) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(initiate_message.description.get());
   DCHECK(authenticator.get());
   DCHECK_EQ(authenticator->state(), Authenticator::WAITING_MESSAGE);
 
   peer_address_ = initiate_message.from;
   authenticator_ = std::move(authenticator);
   session_id_ = initiate_message.sid;
+  message_queue_->setInitialId(id);
 
   SetState(ACCEPTING);
 
   config_ =
       SessionConfig::SelectCommon(initiate_message.description->config(),
                                   session_manager_->protocol_config_.get());
   if (!config_) {
     LOG(WARNING) << "Rejecting connection from " << peer_address_.id()
                  << " because no compatible configuration has been found.";
     Close(INCOMPATIBLE_PROTOCOL);
@@ skipping 553 matching lines @@
       authenticator_->GetNextMessage()));
   SendMessage(std::move(message));
 }
 
 std::string JingleSession::GetNextOutgoingId() {
   return outgoing_id_prefix_ + "_" + base::IntToString(++next_outgoing_id_);
 }
 
 }  // namespace protocol
 }  // namespace remoting