Fix BWE simulations so that it uses the delay based BWE.

webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc

Index: webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
index c953bd83e08bb53b9d409ad4a7c8f21966a7d0a8..e4d3140c35339a269f973ebea511e2a9882c6d0d 100644
--- a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
+++ b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
@@ -47,8 +47,9 @@ class BweSimulation : public BweTest,
 INSTANTIATE_TEST_CASE_P(VideoSendersTest,
                         BweSimulation,
                         ::testing::Values(kRembEstimator,
-                                          kFullSendSideEstimator,
-                                          kNadaEstimator));
+                                          kAbsSendTimeEstimator,

[stefan-webrtc, 2016/10/19 16:35:19]

If you are ok with it I think we can simply remove the AbsSendTimeEstimator
since it's running the abs send time estimator on the send-side, which is not
something we use or will support.

[terelius, 2016/10/24 12:54:23]

Done.

+                                          kNadaEstimator,
+                                          kSendSideEstimator));
 
 TEST_P(BweSimulation, SprintUplinkTest) {
   AdaptiveVideoSource source(0, 30, 300, 0, 0);
@@ -380,20 +381,20 @@ TEST_P(BweSimulation, Evaluation8) {
 TEST_P(BweSimulation, GccComparison1) {
   RunVariableCapacity1SingleFlow(GetParam());
   BweTest gcc_test(false);
-  gcc_test.RunVariableCapacity1SingleFlow(kFullSendSideEstimator);
+  gcc_test.RunVariableCapacity1SingleFlow(kSendSideEstimator);
 }
 
 TEST_P(BweSimulation, GccComparison2) {
   const size_t kNumFlows = 2;
   RunVariableCapacity2MultipleFlows(GetParam(), kNumFlows);
   BweTest gcc_test(false);
-  gcc_test.RunVariableCapacity2MultipleFlows(kFullSendSideEstimator, kNumFlows);
+  gcc_test.RunVariableCapacity2MultipleFlows(kSendSideEstimator, kNumFlows);
 }
 
 TEST_P(BweSimulation, GccComparison3) {
   RunBidirectionalFlow(GetParam());
   BweTest gcc_test(false);
-  gcc_test.RunBidirectionalFlow(kFullSendSideEstimator);
+  gcc_test.RunBidirectionalFlow(kSendSideEstimator);
 }
 
 TEST_P(BweSimulation, GccComparison4) {
@@ -405,13 +406,13 @@ TEST_P(BweSimulation, GccComparison4) {
 TEST_P(BweSimulation, GccComparison5) {
   RunRoundTripTimeFairness(GetParam());
   BweTest gcc_test(false);
-  gcc_test.RunRoundTripTimeFairness(kFullSendSideEstimator);
+  gcc_test.RunRoundTripTimeFairness(kSendSideEstimator);
 }
 
 TEST_P(BweSimulation, GccComparison6) {
   RunLongTcpFairness(GetParam());
   BweTest gcc_test(false);
-  gcc_test.RunLongTcpFairness(kFullSendSideEstimator);
+  gcc_test.RunLongTcpFairness(kSendSideEstimator);
 }
 
 TEST_P(BweSimulation, GccComparison7) {
@@ -426,14 +427,14 @@ TEST_P(BweSimulation, GccComparison7) {
                               tcp_starting_times_ms);
 
   BweTest gcc_test(false);
-  gcc_test.RunMultipleShortTcpFairness(
-      kFullSendSideEstimator, tcp_file_sizes_bytes, tcp_starting_times_ms);
+  gcc_test.RunMultipleShortTcpFairness(kSendSideEstimator, tcp_file_sizes_bytes,
+                                       tcp_starting_times_ms);
 }
 
 TEST_P(BweSimulation, GccComparison8) {
   RunPauseResumeFlows(GetParam());
   BweTest gcc_test(false);
-  gcc_test.RunPauseResumeFlows(kFullSendSideEstimator);
+  gcc_test.RunPauseResumeFlows(kSendSideEstimator);
 }
 
 TEST_P(BweSimulation, GccComparisonChoke) {
@@ -442,7 +443,7 @@ TEST_P(BweSimulation, GccComparisonChoke) {
   RunChoke(GetParam(), capacities_kbps);
 
   BweTest gcc_test(false);
-  gcc_test.RunChoke(kFullSendSideEstimator, capacities_kbps);
+  gcc_test.RunChoke(kSendSideEstimator, capacities_kbps);
 }
 
 }  // namespace bwe