[net] Move DnsConfigService to NetworkChangeNotifier.

net/tools/gdig/gdig.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 <stdio.h>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
@@ skipping 234 matching lines @@
 }
 
 void GDig::Start() {
   if (nameserver_.address().size() > 0) {
     DnsConfig dns_config;
     dns_config.attempts = 1;
     dns_config.nameservers.push_back(nameserver_);
     OnDnsConfig(dns_config);
   } else {
     dns_config_service_ = DnsConfigService::CreateSystemService();
-    dns_config_service_->Read(base::Bind(&GDig::OnDnsConfig,
-                                         base::Unretained(this)));
+    dns_config_service_->ReadConfig(base::Bind(&GDig::OnDnsConfig,
+                                               base::Unretained(this)));
     timeout_closure_.Reset(base::Bind(&GDig::OnTimeout,
                                       base::Unretained(this)));
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         timeout_closure_.callback(),
         config_timeout_);
   }
 }
 
 void GDig::Finish(Result result) {
   DCHECK_NE(RESULT_PENDING, result);
   result_ = result;
   if (MessageLoop::current())
     MessageLoop::current()->Quit();
 }
 
 void GDig::OnDnsConfig(const DnsConfig& dns_config_const) {
   timeout_closure_.Cancel();
   DCHECK(dns_config_const.IsValid());
   DnsConfig dns_config = dns_config_const;
 
   if (timeout_.InMilliseconds() > 0)
     dns_config.timeout = timeout_;
-  if (print_config_)
+  if (print_config_) {
     printf("# Dns Configuration\n"
            "%s", DnsConfigToString(dns_config).c_str());
-  if (print_hosts_)
+  }
+  if (print_hosts_) {
     printf("# Host Database\n"
            "%s", DnsHostsToString(dns_config.hosts).c_str());
+  }
 
   // If the user didn't specify a name to resolve we can stop here.
   if (domain_name_.length() == 0) {
     Finish(RESULT_OK);
     return;
   }
 
   scoped_ptr<DnsClient> dns_client(DnsClient::CreateClient(NULL));
   dns_client->SetConfig(dns_config);
   resolver_.reset(
       new HostResolverImpl(
           HostCache::CreateDefaultCache(),
           PrioritizedDispatcher::Limits(NUM_PRIORITIES, 1),
           HostResolverImpl::ProcTaskParams(NULL, 1),
-          scoped_ptr<DnsConfigService>(NULL),
           dns_client.Pass(),
           log_.get()));
 
   HostResolver::RequestInfo info(HostPortPair(domain_name_.c_str(), 80));
 
   CompletionCallback callback = base::Bind(&GDig::OnResolveComplete,
                                            base::Unretained(this));
   int ret = resolver_->Resolve(
       info, &addrlist_, callback, NULL,
       BoundNetLog::Make(log_.get(), net::NetLog::SOURCE_NONE));
@@ skipping 26 matching lines @@
 }
 
 }  // empty namespace
 
 }  // namespace net
 
 int main(int argc, const char* argv[]) {
   net::GDig dig;
   return dig.Main(argc, argv);
 }