Removed old probe cluster logic and logic related to ssrcs from DelayBasedBwe.

webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc

Index: webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc b/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc
index c6907f7a0b2822d75d0b2cbb84f0bffc8d5e3e21..67b50e739fb65e260c4fcc8b872ae60e55669e95 100644
--- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc
+++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc
@@ -168,7 +168,7 @@ void DelayBasedBweTest::IncomingFeedback(int64_t arrival_time_ms,
                                          uint16_t sequence_number,
                                          size_t payload_size) {
   IncomingFeedback(arrival_time_ms, send_time_ms, sequence_number, payload_size,
-                   0);
+                   PacketInfo::kNotAProbe);

[stefan-webrtc, 2016/08/11 11:43:18]

Why do we classify these as not being probes now?

[philipel, 2016/08/11 13:30:51]

It didn't make sense to let this function always insert a packet info saying
this is a probe as all other functions (*TestHelper) using this function in a
loop would result in huge clusters being inserted.

 }
 
 void DelayBasedBweTest::IncomingFeedback(int64_t arrival_time_ms,
@@ -275,9 +275,9 @@ void DelayBasedBweTest::InitialBehaviorTestHelper(
       EXPECT_FALSE(bitrate_observer_->updated());
       bitrate_observer_->Reset();
     }
-
+    int cluster_id = i < 5 ? 0 : PacketInfo::kNotAProbe;

[stefan-webrtc, 2016/08/11 11:43:18]

What does 5 mean?

[philipel, 2016/08/11 13:30:51]

Since I changed the behavior of IncomingFeeback/4 to not always insert a probe I
now let the first 5 packets be probing packets.

[stefan-webrtc, 2016/08/11 15:38:59]

Does it work I'd you dont pass in probe packets? If not, at least make 5 a
constant.

[philipel, 2016/08/12 08:31:02]

This test check that the expected bitrate converges after a certain amount of
time, and if we don't start off by probing then it wont have enough time to
converge.

Earlier the first packets were considered to be probing packets, now we have to
specify that explicitly.

Changed to a constant.

     IncomingFeedback(clock_.TimeInMilliseconds(), send_time_ms,
-                     sequence_number++, kMtu);
+                     sequence_number++, kMtu, cluster_id);
     clock_.AdvanceTimeMilliseconds(1000 / kFramerate);
     send_time_ms += kFrameIntervalMs;
   }
@@ -289,10 +289,6 @@ void DelayBasedBweTest::InitialBehaviorTestHelper(
   EXPECT_TRUE(bitrate_observer_->updated());
   bitrate_observer_->Reset();
   EXPECT_EQ(bitrate_observer_->latest_bitrate(), bitrate_bps);
-  bitrate_estimator_->RemoveStream(kDefaultSsrc);
-  EXPECT_TRUE(bitrate_estimator_->LatestEstimate(&ssrcs, &bitrate_bps));
-  ASSERT_EQ(0u, ssrcs.size());
-  EXPECT_EQ(0u, bitrate_bps);
 }
 
 void DelayBasedBweTest::RateIncreaseReorderingTestHelper(
@@ -310,9 +306,9 @@ void DelayBasedBweTest::RateIncreaseReorderingTestHelper(
       bitrate_estimator_->Process();
       EXPECT_FALSE(bitrate_observer_->updated());  // No valid estimate.
     }
-
+    int cluster_id = i < 5 ? 0 : PacketInfo::kNotAProbe;
     IncomingFeedback(clock_.TimeInMilliseconds(), send_time_ms,
-                     sequence_number++, kMtu);
+                     sequence_number++, kMtu, cluster_id);
     clock_.AdvanceTimeMilliseconds(kFrameIntervalMs);
     send_time_ms += kFrameIntervalMs;
   }