[net] Move DnsConfigService to NetworkChangeNotifier.

net/base/network_change_notifier_mac.cc

 // 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.
 
 #include "net/base/network_change_notifier_mac.h"
 
 #include <netinet/in.h>
 #include <resolv.h>
 
 #include "base/basictypes.h"
 #include "base/threading/thread.h"
-#include "net/dns/dns_config_watcher.h"
-
-#ifndef _PATH_RESCONF  // Normally defined in <resolv.h>
-#define _PATH_RESCONF "/etc/resolv.conf"
-#endif
+#include "net/dns/dns_config_service.h"
 
 namespace net {
 
 static bool CalculateReachability(SCNetworkConnectionFlags flags) {
   bool reachable = flags & kSCNetworkFlagsReachable;
   bool connection_required = flags & kSCNetworkFlagsConnectionRequired;
   return reachable && !connection_required;
 }
 
 NetworkChangeNotifier::ConnectionType CalculateConnectionType(
     SCNetworkConnectionFlags flags) {
   bool reachable = CalculateReachability(flags);
   if (reachable) {
 #if defined(OS_IOS)
     return (flags & kSCNetworkReachabilityFlagsIsWWAN) ?
         NetworkChangeNotifier::CONNECTION_3G :
         NetworkChangeNotifier::CONNECTION_WIFI;
 #else
     // TODO(droger): Get something more detailed than CONNECTION_UNKNOWN.
     // http://crbug.com/112937
     return NetworkChangeNotifier::CONNECTION_UNKNOWN;
 #endif  // defined(OS_IOS)
   } else {
     return NetworkChangeNotifier::CONNECTION_NONE;
   }
 }
 
-class NetworkChangeNotifierMac::DnsWatcherThread : public base::Thread {
+// Thread on which we can run DnsConfigService, which requires a TYPE_IO
+// message loop.
+class NetworkChangeNotifierMac::DnsConfigServiceThread : public base::Thread {
  public:
-  DnsWatcherThread() : base::Thread("DnsWatcher") {}
+  DnsConfigServiceThread() : base::Thread("DnsConfigService") {}
 
-  virtual ~DnsWatcherThread() {
+  virtual ~DnsConfigServiceThread() {
     Stop();
   }
 
   virtual void Init() OVERRIDE {
-    watcher_.Init();
+    service_ = DnsConfigService::CreateSystemService();
+    service_->WatchConfig(base::Bind(&NetworkChangeNotifier::SetDnsConfig));
   }
 
   virtual void CleanUp() OVERRIDE {
-    watcher_.CleanUp();
+    service_.reset();
   }
 
  private:
-  internal::DnsConfigWatcher watcher_;
+  scoped_ptr<DnsConfigService> service_;
 
-  DISALLOW_COPY_AND_ASSIGN(DnsWatcherThread);
+  DISALLOW_COPY_AND_ASSIGN(DnsConfigServiceThread);
 };
 
 NetworkChangeNotifierMac::NetworkChangeNotifierMac()
     : connection_type_(CONNECTION_UNKNOWN),
       connection_type_initialized_(false),
       initial_connection_type_cv_(&connection_type_lock_),
       forwarder_(this),
-      dns_watcher_thread_(new DnsWatcherThread()) {
+      dns_config_service_thread_(new DnsConfigServiceThread()) {
   // Must be initialized after the rest of this object, as it may call back into
   // SetInitialConnectionType().
   config_watcher_.reset(new NetworkConfigWatcherMac(&forwarder_));
-  dns_watcher_thread_->StartWithOptions(
-      base::Thread::Options(MessageLoop::TYPE_IO, 0));
+  dns_config_service_thread_->StartWithOptions(
+        base::Thread::Options(MessageLoop::TYPE_IO, 0));
 }
 
 NetworkChangeNotifierMac::~NetworkChangeNotifierMac() {
   // Delete the ConfigWatcher to join the notifier thread, ensuring that
   // StartReachabilityNotifications() has an opportunity to run to completion.
   config_watcher_.reset();
 
   // Now that StartReachabilityNotifications() has either run to completion or
   // never run at all, unschedule reachability_ if it was previously scheduled.
   if (reachability_.get() && run_loop_.get()) {
@@ skipping 163 matching lines @@
 
 #if defined(OS_IOS)
   // On iOS, the SCDynamicStore API does not exist, and we use the reachability
   // API to detect IP address changes instead.
   if (new_type != CONNECTION_NONE)
     NotifyObserversOfIPAddressChange();
 #endif  // defined(OS_IOS)
 }
 
 }  // namespace net