diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 19:06:01 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 19:06:01 +0000 |
| commit | 9715b85f74e95db5345fd33ef43ff48eb0ce983f (patch) | |
| tree | 4db4724ac54f5e6a37d0cd6f42e2159e69db4d54 /net/proxy/proxy_config_service_mac.cc | |
| parent | 1cfb7420fb7ea2fa5a6360bbee5424918e84a027 (diff) | |
| download | chromium_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/proxy/proxy_config_service_mac.cc')
| -rw-r--r-- | net/proxy/proxy_config_service_mac.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/proxy/proxy_config_service_mac.cc b/net/proxy/proxy_config_service_mac.cc index a197313..84a5da3 100644 --- a/net/proxy/proxy_config_service_mac.cc +++ b/net/proxy/proxy_config_service_mac.cc @@ -186,9 +186,7 @@ class ProxyConfigServiceMac::Helper }; ProxyConfigServiceMac::ProxyConfigServiceMac(MessageLoop* io_loop) - : forwarder_(this), - config_watcher_(&forwarder_), - has_fetched_config_(false), + : has_fetched_config_(false), helper_(new Helper(this)), io_loop_(io_loop) { DCHECK(io_loop); @@ -225,8 +223,6 @@ bool ProxyConfigServiceMac::GetLatestProxyConfig(ProxyConfig* config) { void ProxyConfigServiceMac::SetDynamicStoreNotificationKeys( SCDynamicStoreRef store) { - // Called on notifier thread. - CFStringRef proxies_key = SCDynamicStoreKeyCreateProxies(NULL); CFArrayRef key_array = CFArrayCreate( NULL, (const void **)(&proxies_key), 1, &kCFTypeArrayCallBacks); |