| Index: net/base/network_config_watcher_mac.cc
|
| diff --git a/net/base/network_config_watcher_mac.cc b/net/base/network_config_watcher_mac.cc
|
| index 7d2377cc3fe3f0ce46348081bc2cd2ea6a857cb4..7d78dccfec482dc1110e89b5277e60ec868db57d 100644
|
| --- a/net/base/network_config_watcher_mac.cc
|
| +++ b/net/base/network_config_watcher_mac.cc
|
| @@ -54,7 +54,8 @@ NetworkConfigWatcherMacThread::NetworkConfigWatcherMacThread(
|
| NetworkConfigWatcherMac::Delegate* delegate)
|
| : base::Thread("NetworkConfigWatcher"),
|
| delegate_(delegate),
|
| - weak_factory_(this) {}
|
| + weak_factory_(this) {
|
| +}
|
|
|
| NetworkConfigWatcherMacThread::~NetworkConfigWatcherMacThread() {
|
| // Allow IO because Stop() calls PlatformThread::Join(), which is a blocking
|
| @@ -85,8 +86,8 @@ void NetworkConfigWatcherMacThread::CleanUp() {
|
| if (!run_loop_source_.get())
|
| return;
|
|
|
| - CFRunLoopRemoveSource(CFRunLoopGetCurrent(), run_loop_source_.get(),
|
| - kCFRunLoopCommonModes);
|
| + CFRunLoopRemoveSource(
|
| + CFRunLoopGetCurrent(), run_loop_source_.get(), kCFRunLoopCommonModes);
|
| run_loop_source_.reset();
|
| }
|
|
|
| @@ -95,18 +96,18 @@ void NetworkConfigWatcherMacThread::InitNotifications() {
|
| // SCDynamicStore API does not exist on iOS.
|
| // Add a run loop source for a dynamic store to the current run loop.
|
| SCDynamicStoreContext context = {
|
| - 0, // Version 0.
|
| - delegate_, // User data.
|
| - NULL, // This is not reference counted. No retain function.
|
| - NULL, // This is not reference counted. No release function.
|
| - NULL, // No description for this.
|
| + 0, // Version 0.
|
| + delegate_, // User data.
|
| + NULL, // This is not reference counted. No retain function.
|
| + NULL, // This is not reference counted. No release function.
|
| + NULL, // No description for this.
|
| };
|
| base::ScopedCFTypeRef<SCDynamicStoreRef> store(SCDynamicStoreCreate(
|
| NULL, CFSTR("org.chromium"), DynamicStoreCallback, &context));
|
| - run_loop_source_.reset(SCDynamicStoreCreateRunLoopSource(
|
| - NULL, store.get(), 0));
|
| - CFRunLoopAddSource(CFRunLoopGetCurrent(), run_loop_source_.get(),
|
| - kCFRunLoopCommonModes);
|
| + run_loop_source_.reset(
|
| + SCDynamicStoreCreateRunLoopSource(NULL, store.get(), 0));
|
| + CFRunLoopAddSource(
|
| + CFRunLoopGetCurrent(), run_loop_source_.get(), kCFRunLoopCommonModes);
|
| #endif // !defined(OS_IOS)
|
|
|
| // Set up notifications for interface and IP address changes.
|
| @@ -127,6 +128,7 @@ NetworkConfigWatcherMac::NetworkConfigWatcherMac(Delegate* delegate)
|
| notifier_thread_->StartWithOptions(thread_options);
|
| }
|
|
|
| -NetworkConfigWatcherMac::~NetworkConfigWatcherMac() {}
|
| +NetworkConfigWatcherMac::~NetworkConfigWatcherMac() {
|
| +}
|
|
|
| } // namespace net
|
|
|