BitrateProber now correctly change state to kWait when the last probing

webrtc/modules/pacing/paced_sender_unittest.cc

Index: webrtc/modules/pacing/paced_sender_unittest.cc
diff --git a/webrtc/modules/pacing/paced_sender_unittest.cc b/webrtc/modules/pacing/paced_sender_unittest.cc
index f698555ce3bee0489710ed785a4b54062d5840a9..063ec1e1947f566578850b24646b9e79c285a329 100644
--- a/webrtc/modules/pacing/paced_sender_unittest.cc
+++ b/webrtc/modules/pacing/paced_sender_unittest.cc
@@ -870,11 +870,12 @@ TEST_F(PacedSenderTest, AverageQueueTime) {
   EXPECT_EQ(0, send_bucket_->AverageQueueTimeMs());
 }
 
-TEST_F(PacedSenderTest, DISABLED_ProbeClusterId) {
+TEST_F(PacedSenderTest, ProbeClusterId) {
   uint32_t ssrc = 12346;
   uint16_t sequence_number = 1234;
   const size_t kPacketSize = 1200;
 

[danilchap, 2016/06/02 14:28:05]

May be add constants
kPacketsPerProbe = 5;
kPacketsPerFirstProbe = kPacketsPerProbe + 1;
and use them instead of magic numbers 5,6,11

+  send_bucket_->SetAllocatedSendBitrate(kTargetBitrateBps, kTargetBitrateBps);
   send_bucket_->SetProbingEnabled(true);
   for (int i = 0; i < 11; ++i) {
     send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
@@ -886,18 +887,24 @@ TEST_F(PacedSenderTest, DISABLED_ProbeClusterId) {
   EXPECT_CALL(callback_, TimeToSendPacket(_, _, _, _, 0))
       .Times(6)
       .WillRepeatedly(Return(true));
-  for (int i = 0; i < 6; ++i)
+  for (int i = 0; i < 6; ++i) {
+    clock_.AdvanceTimeMilliseconds(20);
     send_bucket_->Process();
+  }
 
   // Second probing cluster.
   EXPECT_CALL(callback_, TimeToSendPacket(_, _, _, _, 1))
       .Times(5)
       .WillRepeatedly(Return(true));
-  for (int i = 0; i < 5; ++i)
+  for (int i = 0; i < 5; ++i) {
+    clock_.AdvanceTimeMilliseconds(20);
     send_bucket_->Process();
+  }
 
   // No more probing packets.
-  EXPECT_CALL(callback_, TimeToSendPadding(_, _)).Times(1);
+  EXPECT_CALL(callback_, TimeToSendPadding(_, PacketInfo::kNotAProbe))
+        .Times(1)
+        .WillRepeatedly(Return(500));
   send_bucket_->Process();
 }