Add the last_sent_packet_id to the candidate pair change signal

webrtc/pc/channel_unittest.cc

 /*
  *  Copyright 2009 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 952 matching lines @@
     cricket::TransportChannel* transport_channel1 =
         channel1_->transport_channel();
     ASSERT_TRUE(transport_channel1 != nullptr);
     typename T::MediaChannel* media_channel1 =
         static_cast<typename T::MediaChannel*>(channel1_->media_channel());
     ASSERT_TRUE(media_channel1 != nullptr);
 
     media_channel1_->set_num_network_route_changes(0);
     // The transport channel becomes disconnected.
     transport_channel1->SignalSelectedCandidatePairChanged(transport_channel1,
-                                                           nullptr);
+                                                           nullptr, -1);
     EXPECT_EQ(1, media_channel1_->num_network_route_changes());
     EXPECT_FALSE(media_channel1->last_network_route().connected);
 
     media_channel1_->set_num_network_route_changes(0);
     // The transport channel becomes connected.
     rtc::SocketAddress local_address("192.168.1.1", 1000 /* port number */);
     rtc::SocketAddress remote_address("192.168.1.2", 2000 /* port number */);
     uint16_t local_net_id = 1;
     uint16_t remote_net_id = 2;
+    int last_packet_id = 100;
     rtc::scoped_ptr<cricket::CandidatePairInterface> candidate_pair(
         transport_controller1_.CreateFakeCandidatePair(
             local_address, local_net_id, remote_address, remote_net_id));
     transport_channel1->SignalSelectedCandidatePairChanged(
-        transport_channel1, candidate_pair.get());
+        transport_channel1, candidate_pair.get(), last_packet_id);
     EXPECT_EQ(1, media_channel1_->num_network_route_changes());
-    cricket::NetworkRoute expected_network_route(local_net_id, remote_net_id);
+    cricket::NetworkRoute expected_network_route(local_net_id, remote_net_id,
+                                                 last_packet_id);
     EXPECT_EQ(expected_network_route, media_channel1->last_network_route());
+    EXPECT_EQ(last_packet_id,
+              media_channel1->last_network_route().last_sent_packet_id);
   }
 
   // Test setting up a call.
   void TestCallSetup() {
     CreateChannels(0, 0);
     EXPECT_FALSE(channel1_->secure());
     EXPECT_TRUE(SendInitiate());
     if (verify_playout_) {
       EXPECT_TRUE(media_channel1_->playout());
     }
@@ skipping 1817 matching lines @@
   };
   rtc::CopyOnWriteBuffer payload(data, 3);
   cricket::SendDataResult result;
   ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
   EXPECT_EQ(params.ssrc,
             media_channel1_->last_sent_data_params().ssrc);
   EXPECT_EQ("foo", media_channel1_->last_sent_data());
 }
 
 // TODO(pthatcher): TestSetReceiver?