| Index: net/dns/dns_config_service_unittest.cc
|
| diff --git a/net/dns/dns_config_service_unittest.cc b/net/dns/dns_config_service_unittest.cc
|
| index 25338090a3e588312be4fb622c358c1bc549da78..5f8521a80fa71131dceaff24ae59be63484d24c4 100644
|
| --- a/net/dns/dns_config_service_unittest.cc
|
| +++ b/net/dns/dns_config_service_unittest.cc
|
| @@ -29,7 +29,8 @@ class DnsConfigServiceTest : public testing::Test {
|
| 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() {
|
| @@ -84,8 +85,8 @@ class DnsConfigServiceTest : public testing::Test {
|
| 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());
|
| }
|
|
|
| @@ -196,8 +197,8 @@ 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 " <<
|
|
|