Use continual gathering to restore backup connections

webrtc/base/network_unittest.cc

 /*
  *  Copyright 2004 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 49 matching lines @@
 }  // namespace
 
 class NetworkTest : public testing::Test, public sigslot::has_slots<>  {
  public:
   NetworkTest() : callback_called_(false) {}
 
   void OnNetworksChanged() {
     callback_called_ = true;
   }
 
-  void listenToNetworkInactive(BasicNetworkManager& network_manager) {
-    BasicNetworkManager::NetworkList networks;
-    network_manager.GetNetworks(&networks);
-    for (Network* network : networks) {
-      network->SignalInactive.connect(this, &NetworkTest::OnNetworkInactive);
-    }
-  }
-
-  void OnNetworkInactive(const Network* network) { num_networks_inactive_++; }
-
   NetworkManager::Stats MergeNetworkList(
       BasicNetworkManager& network_manager,
       const NetworkManager::NetworkList& list,
       bool* changed) {
     NetworkManager::Stats stats;
     network_manager.MergeNetworkList(list, changed, &stats);
     return stats;
   }
 
   bool IsIgnoredNetwork(BasicNetworkManager& network_manager,
@@ skipping 90 matching lines @@
       delete if_addr->ifa_addr;
       delete if_addr->ifa_netmask;
       delete if_addr;
       if_addr = next_addr;
     }
   }
 #endif  // defined(WEBRTC_POSIX)
 
  protected:
   bool callback_called_;
-  // Number of networks that become inactive.
-  int num_networks_inactive_ = 0;
 };
 
 class TestBasicNetworkManager : public BasicNetworkManager {
  public:
   using BasicNetworkManager::QueryDefaultLocalAddress;
   using BasicNetworkManager::set_default_local_addresses;
 };
 
 // Test that the Network ctor works properly.
 TEST_F(NetworkTest, TestNetworkConstruct) {
@@ skipping 113 matching lines @@
   BasicNetworkManager manager;
 
   // Add ipv4_network1 to the list of networks.
   NetworkManager::NetworkList list;
   list.push_back(new Network(ipv4_network1));
   bool changed;
   NetworkManager::Stats stats = MergeNetworkList(manager, list, &changed);
   EXPECT_TRUE(changed);
   EXPECT_EQ(stats.ipv6_network_count, 0);
   EXPECT_EQ(stats.ipv4_network_count, 1);
-  listenToNetworkInactive(manager);
   list.clear();
 
   manager.GetNetworks(&list);
   EXPECT_EQ(1U, list.size());
   EXPECT_EQ(ipv4_network1.ToString(), list[0]->ToString());
   Network* net1 = list[0];
   uint16_t net_id1 = net1->id();
   EXPECT_EQ(1, net_id1);
   list.clear();
 
   // Replace ipv4_network1 with ipv4_network2.
   list.push_back(new Network(ipv4_network2));
   stats = MergeNetworkList(manager, list, &changed);
   EXPECT_TRUE(changed);
   EXPECT_EQ(stats.ipv6_network_count, 0);
   EXPECT_EQ(stats.ipv4_network_count, 1);
-  EXPECT_EQ(1, num_networks_inactive_);
   list.clear();
-  num_networks_inactive_ = 0;
 
   manager.GetNetworks(&list);
   EXPECT_EQ(1U, list.size());
   EXPECT_EQ(ipv4_network2.ToString(), list[0]->ToString());
   Network* net2 = list[0];
   uint16_t net_id2 = net2->id();
   // Network id will increase.
   EXPECT_LT(net_id1, net_id2);
   list.clear();
 
   // Add Network2 back.
   list.push_back(new Network(ipv4_network1));
   list.push_back(new Network(ipv4_network2));
   stats = MergeNetworkList(manager, list, &changed);
   EXPECT_TRUE(changed);
   EXPECT_EQ(stats.ipv6_network_count, 0);
   EXPECT_EQ(stats.ipv4_network_count, 2);
-  EXPECT_EQ(0, num_networks_inactive_);
   list.clear();
 
   // Verify that we get previous instances of Network objects.
   manager.GetNetworks(&list);
   EXPECT_EQ(2U, list.size());
   EXPECT_TRUE((net1 == list[0] && net2 == list[1]) ||
               (net1 == list[1] && net2 == list[0]));
   EXPECT_TRUE((net_id1 == list[0]->id() && net_id2 == list[1]->id()) ||
               (net_id1 == list[1]->id() && net_id2 == list[0]->id()));
   list.clear();
 
   // Call MergeNetworkList() again and verify that we don't get update
   // notification.
   list.push_back(new Network(ipv4_network2));
   list.push_back(new Network(ipv4_network1));
   stats = MergeNetworkList(manager, list, &changed);
   EXPECT_FALSE(changed);
   EXPECT_EQ(stats.ipv6_network_count, 0);
   EXPECT_EQ(stats.ipv4_network_count, 2);
-  EXPECT_EQ(0, num_networks_inactive_);
   list.clear();
 
   // Verify that we get previous instances of Network objects.
   manager.GetNetworks(&list);
   EXPECT_EQ(2U, list.size());
   EXPECT_TRUE((net1 == list[0] && net2 == list[1]) ||
               (net1 == list[1] && net2 == list[0]));
   EXPECT_TRUE((net_id1 == list[0]->id() && net_id2 == list[1]->id()) ||
               (net_id1 == list[1]->id() && net_id2 == list[0]->id()));
   list.clear();
@@ skipping 762 matching lines @@
   // If the set default address is in a network, GetDefaultLocalAddress will
   // return the best IP in that network.
   manager.set_default_local_addresses(GetLoopbackIP(AF_INET), ip2);
   EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
   EXPECT_EQ(static_cast<IPAddress>(ip1), ip);
 
   manager.StopUpdating();
 }
 
 }  // namespace rtc