fix bug 5430

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 922 matching lines @@
   EXPECT_TRUE_WAIT(callback_called_, 1000);
 
   // Network manager is stopped; the network monitor is removed.
   manager.StopUpdating();
   EXPECT_TRUE(GetNetworkMonitor(manager) == nullptr);
 
   NetworkMonitorFactory::ReleaseFactory(factory);
 }
 
 TEST_F(NetworkTest, DefaultLocalAddress) {
+  IPAddress ip;
   TestBasicNetworkManager manager;
+  manager.SignalNetworksChanged.connect(static_cast<NetworkTest*>(this),
+                                        &NetworkTest::OnNetworksChanged);
+  FakeNetworkMonitorFactory* factory = new FakeNetworkMonitorFactory();
+  NetworkMonitorFactory::SetFactory(factory);
   manager.StartUpdating();
-  IPAddress ip;
-
-  // GetDefaultLocalAddress should return false when not set.
-  EXPECT_FALSE(manager.GetDefaultLocalAddress(AF_INET, &ip));
-  EXPECT_FALSE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
+  EXPECT_TRUE_WAIT(callback_called_, 1000);
 
   // Make sure we can query default local address when an address for such
   // address family exists.
   std::vector<Network*> networks;

[pthatcher1, 2016/01/15 19:30:52]

Should we EXPECT_TRUE(!networks.empty()) ?

   manager.GetNetworks(&networks);
   for (auto& network : networks) {
     if (network->GetBestIP().family() == AF_INET) {
       EXPECT_TRUE(manager.QueryDefaultLocalAddress(AF_INET) != IPAddress());
     } else if (network->GetBestIP().family() == AF_INET6) {
       EXPECT_TRUE(manager.QueryDefaultLocalAddress(AF_INET6) != IPAddress());
     }
   }
 
   // GetDefaultLocalAddress should return the valid default address after set.
   manager.set_default_local_addresses(GetLoopbackIP(AF_INET),
                                       GetLoopbackIP(AF_INET6));
   EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET, &ip));
   EXPECT_EQ(ip, GetLoopbackIP(AF_INET));
   EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
   EXPECT_EQ(ip, GetLoopbackIP(AF_INET6));
   manager.StopUpdating();
 }
 
 }  // namespace rtc