Fix NetworkChangeNotifier crashes on Mac.

Revert r58230.
BUG=54305,53138
TEST=Make sure ethernet is plugged in.  Run Chrome.  Unplug ethernet.  Does not crash.

Review URL: http://codereview.chromium.org/3350009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58520 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 29 deletions

diff --git a/net/base/network_change_notifier_mac.h b/net/base/network_change_notifier_mac.h
index 33cf99c..1d23524 100644
--- a/net/base/network_change_notifier_mac.h
+++ b/net/base/network_change_notifier_mac.h
@@ -14,39 +14,17 @@
 
 namespace net {
 
-class NetworkChangeNotifierMac: public NetworkChangeNotifier {
+class NetworkChangeNotifierMac : public NetworkConfigWatcherMac,
+                                 public NetworkChangeNotifier {
  public:
   NetworkChangeNotifierMac();
-  virtual ~NetworkChangeNotifierMac();
 
- private:
-  // Forwarder just exists to keep the NetworkConfigWatcherMac API out of
-  // NetworkChangeNotifierMac's public API.
-  class Forwarder : public NetworkConfigWatcherMac::Delegate {
-   public:
-    explicit Forwarder(NetworkChangeNotifierMac* net_config_watcher)
-        : net_config_watcher_(net_config_watcher_) {}
-
-    // NetworkConfigWatcherMac::Delegate implementation:
-    virtual void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store) {
-      net_config_watcher_->SetDynamicStoreNotificationKeys(store);
-    }
-    virtual void OnNetworkConfigChange(CFArrayRef changed_keys) {
-      net_config_watcher_->OnNetworkConfigChange(changed_keys);
-    }
-
-   private:
-    NetworkChangeNotifierMac* const net_config_watcher_;
-    DISALLOW_COPY_AND_ASSIGN(Forwarder);
-  };
-
-  // NetworkConfigWatcherMac::Delegate implementation:
-  void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store);
-  void OnNetworkConfigChange(CFArrayRef changed_keys);
-
-  Forwarder forwarder_;
-  const NetworkConfigWatcherMac config_watcher_;
+ protected:
+  // NetworkConfigWatcherMac implementation:
+  virtual void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store);
+  virtual void OnNetworkConfigChange(CFArrayRef changed_keys);
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierMac);
 };