Move the concept of multiple route into Network

webrtc/base/network_unittest.cc

Index: webrtc/base/network_unittest.cc
diff --git a/webrtc/base/network_unittest.cc b/webrtc/base/network_unittest.cc
index fdf75caf37aed77c4538495175c791c341b72609..30019d1c2850c6c87bfa3982985ddfbff87595b2 100644
--- a/webrtc/base/network_unittest.cc
+++ b/webrtc/base/network_unittest.cc
@@ -177,14 +177,17 @@ TEST_F(NetworkTest, DISABLED_TestCreateNetworks) {
   }
 }
 
-// Test that UpdateNetworks succeeds.
+// Test StartUpdating() and StopUpdating(). network_permission_state starts with
+// UNKNOWN and changes to ALLOWED until no outstanding StartUpdating.
 TEST_F(NetworkTest, TestUpdateNetworks) {
   BasicNetworkManager manager;
   manager.SignalNetworksChanged.connect(
       static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
+  EXPECT_EQ(manager.network_permission_state(), NetworkManager::STATE_UNKNOWN);
   manager.StartUpdating();
   Thread::Current()->ProcessMessages(0);
   EXPECT_TRUE(callback_called_);
+  EXPECT_EQ(manager.network_permission_state(), NetworkManager::STATE_ALLOWED);
   callback_called_ = false;
   // Callback should be triggered immediately when StartUpdating
   // is called, after network update signal is already sent.
@@ -193,16 +196,20 @@ TEST_F(NetworkTest, TestUpdateNetworks) {
   Thread::Current()->ProcessMessages(0);
   EXPECT_TRUE(callback_called_);
   manager.StopUpdating();
+  EXPECT_EQ(manager.network_permission_state(), NetworkManager::STATE_ALLOWED);
   EXPECT_TRUE(manager.started());
   manager.StopUpdating();
+  EXPECT_EQ(manager.network_permission_state(), NetworkManager::STATE_UNKNOWN);
   EXPECT_FALSE(manager.started());
   manager.StopUpdating();
+  EXPECT_EQ(manager.network_permission_state(), NetworkManager::STATE_UNKNOWN);
   EXPECT_FALSE(manager.started());
   callback_called_ = false;
   // Callback should be triggered immediately after StartUpdating is called
   // when start_count_ is reset to 0.
   manager.StartUpdating();
   Thread::Current()->ProcessMessages(0);
+  EXPECT_EQ(manager.network_permission_state(), NetworkManager::STATE_ALLOWED);
   EXPECT_TRUE(callback_called_);
 }