[net] Move DnsConfigService to NetworkChangeNotifier.

net/tools/net_watcher/net_watcher.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.
 
 // This is a small utility that watches for and logs network changes.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
@@ skipping 33 matching lines @@
       return "CONNECTION_3G";
     case net::NetworkChangeNotifier::CONNECTION_4G:
       return "CONNECTION_4G";
     case net::NetworkChangeNotifier::CONNECTION_NONE:
       return "CONNECTION_NONE";
     default:
       return "CONNECTION_UNEXPECTED";
   }
 }
 
-std::string DNSDetailToString(unsigned detail) {
-  const char kSeparator[] = " | ";
-  std::string detail_str;
-  if (detail & net::NetworkChangeNotifier::CHANGE_DNS_SETTINGS)
-    detail_str += "CHANGE_DNS_SETTINGS";
-  if (detail & net::NetworkChangeNotifier::CHANGE_DNS_HOSTS) {
-    if (!detail_str.empty())
-      detail_str += kSeparator;
-    detail_str += "CHANGE_DNS_HOSTS";
-  }
-  if (detail & net::NetworkChangeNotifier::CHANGE_DNS_WATCH_STARTED) {
-    if (!detail_str.empty())
-      detail_str += kSeparator;
-    detail_str += "CHANGE_DNS_WATCH_STARTED";
-  }
-  if (detail & net::NetworkChangeNotifier::CHANGE_DNS_WATCH_FAILED) {
-    if (!detail_str.empty())
-      detail_str += kSeparator;
-    detail_str += "CHANGE_DNS_WATCH_FAILED";
-  }
-  return detail_str;
-}
-
 std::string ProxyConfigToString(const net::ProxyConfig& config) {
   scoped_ptr<base::Value> config_value(config.ToValue());
   std::string str;
   base::JSONWriter::Write(config_value.get(), &str);
   return str;
 }
 
 const char* ConfigAvailabilityToString(
     net::ProxyConfigService::ConfigAvailability availability) {
   switch (availability) {
@@ skipping 25 matching lines @@
   }
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver implementation.
   virtual void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
     LOG(INFO) << "OnConnectionTypeChanged("
               << ConnectionTypeToString(type) << ")";
   }
 
   // net::NetworkChangeNotifier::DNSObserver implementation.
-  virtual void OnDNSChanged(unsigned detail) OVERRIDE {
-    LOG(INFO) << "OnDNSChanged(" << DNSDetailToString(detail) << ")";
+  virtual void OnDNSChanged() OVERRIDE {
+    LOG(INFO) << "OnDNSChanged()";
   }
 
   // net::ProxyConfigService::Observer implementation.
   virtual void OnProxyConfigChanged(
       const net::ProxyConfig& config,
       net::ProxyConfigService::ConfigAvailability availability) OVERRIDE {
     LOG(INFO) << "OnProxyConfigChanged("
               << ProxyConfigToString(config) << ", "
               << ConfigAvailabilityToString(availability) << ")";
   }
@@ skipping 46 matching lines @@
     net::ProxyConfig config;
     const net::ProxyConfigService::ConfigAvailability availability =
         proxy_config_service->GetLatestProxyConfig(&config);
     LOG(INFO) << "Initial proxy config: "
               << ProxyConfigToString(config) << ", "
               << ConfigAvailabilityToString(availability);
   }
 
   LOG(INFO) << "Watching for network events...";
 
-  if (net::NetworkChangeNotifier::IsWatchingDNS()) {
-    LOG(INFO) << "Watching for DNS changes...";
-  } else {
-    LOG(INFO) << "Not watching for DNS changes";
-  }
-
   // Start watching for events.
   network_loop.Run();
 
   proxy_config_service->RemoveObserver(&net_watcher);
 
   // Uses |network_change_notifier|.
   net::NetworkChangeNotifier::RemoveDNSObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveIPAddressObserver(&net_watcher);
 
   return 0;
 }