[NetworkChangeNotifier] Return more specific network connection types (ethernet/wifi) on OSX

net/base/network_change_notifier_mac.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/network_change_notifier_mac.h"
 
 #include <netinet/in.h>
 #include <resolv.h>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/dns/dns_config_service.h"
 
 namespace net {
 
 static bool CalculateReachability(SCNetworkConnectionFlags flags) {
   bool reachable = flags & kSCNetworkFlagsReachable;
   bool connection_required = flags & kSCNetworkFlagsConnectionRequired;
   return reachable && !connection_required;
 }
 
-NetworkChangeNotifier::ConnectionType CalculateConnectionType(
-    SCNetworkConnectionFlags flags) {
-  bool reachable = CalculateReachability(flags);
-  if (reachable) {
-#if defined(OS_IOS)
-    return (flags & kSCNetworkReachabilityFlagsIsWWAN) ?
-        NetworkChangeNotifier::CONNECTION_3G :
-        NetworkChangeNotifier::CONNECTION_WIFI;
-#else
-    // TODO(droger): Get something more detailed than CONNECTION_UNKNOWN.
-    // http://crbug.com/112937
-    return NetworkChangeNotifier::CONNECTION_UNKNOWN;
-#endif  // defined(OS_IOS)
-  } else {
-    return NetworkChangeNotifier::CONNECTION_NONE;
-  }
-}
-
 // Thread on which we can run DnsConfigService, which requires a TYPE_IO
 // message loop.
 class NetworkChangeNotifierMac::DnsConfigServiceThread : public base::Thread {
  public:
   DnsConfigServiceThread() : base::Thread("DnsConfigService") {}
 
   ~DnsConfigServiceThread() override { Stop(); }
 
   void Init() override {
     service_ = DnsConfigService::CreateSystemService();
@@ skipping 58 matching lines @@
   while (!connection_type_initialized_) {
     initial_connection_type_cv_.Wait();
   }
   return connection_type_;
 }
 
 void NetworkChangeNotifierMac::Forwarder::Init()  {
   net_config_watcher_->SetInitialConnectionType();
 }
 
+// static
+NetworkChangeNotifier::ConnectionType
+NetworkChangeNotifierMac::CalculateConnectionType(
+    SCNetworkConnectionFlags flags) {
+  bool reachable = CalculateReachability(flags);
+  if (reachable) {
+#if defined(OS_IOS)
+    return (flags & kSCNetworkReachabilityFlagsIsWWAN) ? CONNECTION_3G
+                                                       : CONNECTION_WIFI;
+#else
+    return ConnectionTypeFromInterfaces();
+#endif  // defined(OS_IOS)
+  } else {
+    return CONNECTION_NONE;
+  }
+}
+
 void NetworkChangeNotifierMac::Forwarder::StartReachabilityNotifications() {
   net_config_watcher_->StartReachabilityNotifications();
 }
 
 void NetworkChangeNotifierMac::Forwarder::SetDynamicStoreNotificationKeys(
     SCDynamicStoreRef store)  {
   net_config_watcher_->SetDynamicStoreNotificationKeys(store);
 }
 
 void NetworkChangeNotifierMac::Forwarder::OnNetworkConfigChange(
@@ skipping 137 matching lines @@
   }
 
 #if defined(OS_IOS)
   // On iOS, the SCDynamicStore API does not exist, and we use the reachability
   // API to detect IP address changes instead.
   NotifyObserversOfIPAddressChange();
 #endif  // defined(OS_IOS)
 }
 
 }  // namespace net