[net/dns] Isolate DnsConfigWatcher from DnsConfigService.

net/dns/dns_test_util.h

 // 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.
 
 #ifndef NET_DNS_DNS_TEST_UTIL_H_
 #define NET_DNS_DNS_TEST_UTIL_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 154 matching lines @@
 static const int kT3TTL = 0x00000015;
 // +2 for the CNAME records.
 static const unsigned kT3RecordCount = arraysize(kT3IpAddresses) + 2;
 
 class DnsClient;
 // Creates mock DnsClient for testing HostResolverImpl.
 scoped_ptr<DnsClient> CreateMockDnsClient(const DnsConfig& config);
 
 class MockDnsConfigService : public DnsConfigService {
  public:
-  virtual ~MockDnsConfigService() {}
+  virtual ~MockDnsConfigService();
 
-  virtual void Watch(const CallbackType& callback) OVERRIDE;
+  // NetworkChangeNotifier::DNSObserver:
+  virtual void OnDNSChanged(unsigned detail) OVERRIDE;
 
   // Expose the protected methods for tests.
-  void ChangeConfig(const DnsConfig& config) {
-    DnsConfigService::OnConfigRead(config);
-  }
-
-  void ChangeHosts(const DnsHosts& hosts) {
-    DnsConfigService::OnHostsRead(hosts);
-  }
+  void ChangeConfig(const DnsConfig& config);
+  void ChangeHosts(const DnsHosts& hosts);
 };
 
 
 }  // namespace net
 
 #endif  // NET_DNS_DNS_TEST_UTIL_H_