Start probes only after network is connected.

webrtc/modules/congestion_controller/congestion_controller_unittest.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
+#include "webrtc/base/networkroute.h"
 #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/congestion_controller/include/congestion_controller.h"
 #include "webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h"
 #include "webrtc/modules/pacing/mock/mock_paced_sender.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
@@ skipping 89 matching lines @@
 
   // Let the pacer not be full next time the controller checks.
   // |OnNetworkChanged| should be called with the new estimate.
   EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
       .WillOnce(Return(PacedSender::kMaxQueueLengthMs - 1));
   EXPECT_CALL(observer_, OnNetworkChanged(kInitialBitrateBps * 2, _, _));
   clock_.AdvanceTimeMilliseconds(25);
   controller_->Process();
 }
 
-TEST_F(CongestionControllerTest, SignalNetworkState) {
+TEST_F(CongestionControllerTest, OnNetworkRouteChanged) {
   EXPECT_CALL(observer_, OnNetworkChanged(0, _, _));
-  controller_->SignalNetworkState(kNetworkDown);
+  rtc::NetworkRoute route;
+  route.connected = false;
+  controller_->OnNetworkRouteChanged(route);
 
   EXPECT_CALL(observer_, OnNetworkChanged(kInitialBitrateBps, _, _));
-  controller_->SignalNetworkState(kNetworkUp);
+  route.connected = true;
+  controller_->OnNetworkRouteChanged(route);
 
   EXPECT_CALL(observer_, OnNetworkChanged(0, _, _));
-  controller_->SignalNetworkState(kNetworkDown);
-}
-
-TEST_F(CongestionControllerTest, ResetBweAndBitrates) {
-  int new_bitrate = 200000;
-  EXPECT_CALL(observer_, OnNetworkChanged(new_bitrate, _, _));
-  EXPECT_CALL(*pacer_, SetEstimatedBitrate(new_bitrate));
-  controller_->ResetBweAndBitrates(new_bitrate, -1, -1);
-
-  // If the bitrate is reset to -1, the new starting bitrate will be
-  // the minimum default bitrate 10000bps.
-  int min_default_bitrate = 10000;
-  EXPECT_CALL(observer_, OnNetworkChanged(min_default_bitrate, _, _));
-  EXPECT_CALL(*pacer_, SetEstimatedBitrate(min_default_bitrate));
-  controller_->ResetBweAndBitrates(-1, -1, -1);
+  route.connected = false;
+  controller_->OnNetworkRouteChanged(route);
 }
 
 TEST_F(CongestionControllerTest,
        SignalNetworkStateAndQueueIsFullAndEstimateChange) {
   // Send queue is full
   EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
       .WillRepeatedly(Return(PacedSender::kMaxQueueLengthMs + 1));
   EXPECT_CALL(observer_, OnNetworkChanged(0, _, _));
   controller_->Process();
 
   // Queue is full and network is down. Expect no bitrate change.
-  controller_->SignalNetworkState(kNetworkDown);
+  rtc::NetworkRoute route;
+  route.connected = false;
+  controller_->OnNetworkRouteChanged(route);
   controller_->Process();
 
   // Queue is full but network is up. Expect no bitrate change.
-  controller_->SignalNetworkState(kNetworkUp);
+  route.connected = true;
+  controller_->OnNetworkRouteChanged(route);
   controller_->Process();
 
   // Receive new estimate but let the queue still be full.
   EXPECT_CALL(*pacer_, SetEstimatedBitrate(kInitialBitrateBps * 2));
   bandwidth_observer_->OnReceivedEstimatedBitrate(kInitialBitrateBps * 2);
   clock_.AdvanceTimeMilliseconds(25);
   controller_->Process();
 
   // Let the pacer not be full next time the controller checks.
   EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
       .WillOnce(Return(PacedSender::kMaxQueueLengthMs - 1));
   EXPECT_CALL(observer_, OnNetworkChanged(kInitialBitrateBps * 2, _, _));
   controller_->Process();
 }
 
 TEST_F(CongestionControllerTest, GetPacerQueuingDelayMs) {
   EXPECT_CALL(observer_, OnNetworkChanged(_, _, _)).Times(AtLeast(1));
 
   const int64_t kQueueTimeMs = 123;
   EXPECT_CALL(*pacer_, QueueInMs()).WillRepeatedly(Return(kQueueTimeMs));
   EXPECT_EQ(kQueueTimeMs, controller_->GetPacerQueuingDelayMs());
 
   // Expect zero pacer delay when network is down.
-  controller_->SignalNetworkState(kNetworkDown);
+  rtc::NetworkRoute route;
+  route.connected = false;
+  controller_->OnNetworkRouteChanged(route);
   EXPECT_EQ(0, controller_->GetPacerQueuingDelayMs());
 
   // Network is up, pacer delay should be reported.
-  controller_->SignalNetworkState(kNetworkUp);
+  route.connected = true;
+  controller_->OnNetworkRouteChanged(route);
   EXPECT_EQ(kQueueTimeMs, controller_->GetPacerQueuingDelayMs());
 }
 
 }  // namespace test
 }  // namespace webrtc