[net] Move DnsConfigService to NetworkChangeNotifier.

This merges DnsConfigWatcher back into DnsConfigService and installs
DnsConfigService at NetworkChangeNotifier. It removes |detail| from
OnDNSChanged callback, and exposes NetworkChangeNotifier::GetDnsConfig.

BUG=142142


Review URL: https://chromiumcodereview.appspot.com/10873018

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

1 files changed, 4 insertions, 4 deletions

diff --git a/net/base/network_change_notifier_mac.h b/net/base/network_change_notifier_mac.h
index 7029929..9a9e6bf 100644
--- a/net/base/network_change_notifier_mac.h
+++ b/net/base/network_change_notifier_mac.h
@@ -26,8 +26,6 @@ class NetworkChangeNotifierMac: public NetworkChangeNotifier {
   // NetworkChangeNotifier implementation:
   virtual ConnectionType GetCurrentConnectionType() const OVERRIDE;
 
-  class DnsWatcherThread;
-
   // Forwarder just exists to keep the NetworkConfigWatcherMac API out of
   // NetworkChangeNotifierMac's public API.
   class Forwarder : public NetworkConfigWatcherMac::Delegate {
@@ -47,6 +45,9 @@ class NetworkChangeNotifierMac: public NetworkChangeNotifier {
     DISALLOW_COPY_AND_ASSIGN(Forwarder);
   };
 
+ private:
+  class DnsConfigServiceThread;
+
   // Methods directly called by the NetworkConfigWatcherMac::Delegate:
   void StartReachabilityNotifications();
   void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store);
@@ -70,8 +71,7 @@ class NetworkChangeNotifierMac: public NetworkChangeNotifier {
   Forwarder forwarder_;
   scoped_ptr<const NetworkConfigWatcherMac> config_watcher_;
 
-  // Thread on which we can run DnsConfigWatcher, which requires TYPE_IO.
-  scoped_ptr<DnsWatcherThread> dns_watcher_thread_;
+  scoped_ptr<DnsConfigServiceThread> dns_config_service_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierMac);
 };