[net] Move DnsConfigService to NetworkChangeNotifier.

net/dns/dns_config_service_unittest.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/dns/dns_config_service.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
     EXPECT_FALSE(config.Equals(last_config_)) <<
         "Config must be different from last call.";
     last_config_ = config;
     if (quit_on_config_)
       MessageLoop::current()->Quit();
   }
 
  protected:
   class TestDnsConfigService : public DnsConfigService {
    public:
-    virtual void OnDNSChanged(unsigned detail) OVERRIDE {}
+    virtual void ReadNow() OVERRIDE {}
+    virtual bool StartWatching() OVERRIDE { return true; }
 
     // Expose the protected methods to this test suite.
     void InvalidateConfig() {
       DnsConfigService::InvalidateConfig();
     }
 
     void InvalidateHosts() {
       DnsConfigService::InvalidateHosts();
     }
 
@@ skipping 34 matching lines @@
     hosts_content.append(seed, '1');
     ParseHosts(hosts_content, &hosts);
     EXPECT_FALSE(hosts.empty());
     return hosts;
   }
 
   virtual void SetUp() OVERRIDE {
     quit_on_config_ = false;
 
     service_.reset(new TestDnsConfigService());
-    service_->Watch(base::Bind(&DnsConfigServiceTest::OnConfigChanged,
-                               base::Unretained(this)));
+    service_->WatchConfig(base::Bind(&DnsConfigServiceTest::OnConfigChanged,
+                                     base::Unretained(this)));
     EXPECT_FALSE(last_config_.IsValid());
   }
 
   DnsConfig last_config_;
   bool quit_on_config_;
 
   // Service under test.
   scoped_ptr<TestDnsConfigService> service_;
 };
 
@@ skipping 90 matching lines @@
   EXPECT_TRUE(last_config_.Equals(config3));
 }
 
 #if (defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN)
 // TODO(szym): This is really an integration test and can time out if HOSTS is
 // huge. http://crbug.com/107810
 TEST_F(DnsConfigServiceTest, FLAKY_GetSystemConfig) {
   service_.reset();
   scoped_ptr<DnsConfigService> service(DnsConfigService::CreateSystemService());
 
-  service->Read(base::Bind(&DnsConfigServiceTest::OnConfigChanged,
-                           base::Unretained(this)));
+  service->ReadConfig(base::Bind(&DnsConfigServiceTest::OnConfigChanged,
+                                 base::Unretained(this)));
   base::TimeDelta kTimeout = TestTimeouts::action_max_timeout();
   WaitForConfig(kTimeout);
   ASSERT_TRUE(last_config_.IsValid()) << "Did not receive DnsConfig in " <<
       kTimeout.InSecondsF() << "s";
 }
 #endif  // OS_POSIX || OS_WIN
 
 }  // namespace net