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

net/base/network_change_notifier_mac.h

 // 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.
 
 #ifndef NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_
 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_
 
 #include <SystemConfiguration/SystemConfiguration.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_config_watcher_mac.h"
 
 namespace net {
 
 class NetworkChangeNotifierMac: public NetworkChangeNotifier {
  public:
   NetworkChangeNotifierMac();
@@ skipping 26 matching lines @@
   // Methods directly called by the NetworkConfigWatcherMac::Delegate:
   void StartReachabilityNotifications();
   void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store);
   void OnNetworkConfigChange(CFArrayRef changed_keys);
 
   void SetInitialConnectionType();
 
   static void ReachabilityCallback(SCNetworkReachabilityRef target,
                                    SCNetworkConnectionFlags flags,
                                    void* notifier);
+  void ReachabilityCallbackImpl(ConnectionType new_type);

[pauljensen, 2017/05/23 15:10:30]

can you add a comment for this function?

[jkarlin, 2017/05/27 01:06:19]

No longer needed.

 
   static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsMac();
+  static ConnectionType CalculateConnectionType(SCNetworkConnectionFlags flags);

[pauljensen, 2017/05/23 15:10:30]

ditto

[jkarlin, 2017/05/27 01:06:19]

No longer needed.

 
   // These must be constructed before config_watcher_ to ensure
   // the lock is in a valid state when Forwarder::Init is called.
   ConnectionType connection_type_;
   bool connection_type_initialized_;
   mutable base::Lock connection_type_lock_;
   mutable base::ConditionVariable initial_connection_type_cv_;
   base::ScopedCFTypeRef<SCNetworkReachabilityRef> reachability_;
   base::ScopedCFTypeRef<CFRunLoopRef> run_loop_;
 
   Forwarder forwarder_;
   std::unique_ptr<const NetworkConfigWatcherMac> config_watcher_;
 
   std::unique_ptr<DnsConfigServiceThread> dns_config_service_thread_;
 
+  base::WeakPtrFactory<NetworkChangeNotifierMac> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierMac);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_