summaryrefslogtreecommitdiffstats
path: root/net/base/network_change_notifier_mac.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 19:06:01 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 19:06:01 +0000
commit9715b85f74e95db5345fd33ef43ff48eb0ce983f (patch)
tree4db4724ac54f5e6a37d0cd6f42e2159e69db4d54 /net/base/network_change_notifier_mac.cc
parent1cfb7420fb7ea2fa5a6360bbee5424918e84a027 (diff)
downloadchromium_src-9715b85f74e95db5345fd33ef43ff48eb0ce983f.zip
chromium_src-9715b85f74e95db5345fd33ef43ff48eb0ce983f.tar.gz
chromium_src-9715b85f74e95db5345fd33ef43ff48eb0ce983f.tar.bz2
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
Diffstat (limited to 'net/base/network_change_notifier_mac.cc')
-rw-r--r--net/base/network_change_notifier_mac.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/base/network_change_notifier_mac.cc b/net/base/network_change_notifier_mac.cc
index d07a15c..4c46a99 100644
--- a/net/base/network_change_notifier_mac.cc
+++ b/net/base/network_change_notifier_mac.cc
@@ -9,14 +9,10 @@
namespace net {
-NetworkChangeNotifierMac::NetworkChangeNotifierMac()
- : forwarder_(this),
- config_watcher_(&forwarder_) {}
-NetworkChangeNotifierMac::~NetworkChangeNotifierMac() {}
+NetworkChangeNotifierMac::NetworkChangeNotifierMac() {}
void NetworkChangeNotifierMac::SetDynamicStoreNotificationKeys(
SCDynamicStoreRef store) {
- // Called on notifier thread.
scoped_cftyperef<CFMutableArrayRef> notification_keys(
CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
scoped_cftyperef<CFStringRef> key(SCDynamicStoreKeyCreateNetworkGlobalEntity(