| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/dns/dns_config_service.h" | 5 #include "net/dns/dns_config_service.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/cancelable_callback.h" | 9 #include "base/cancelable_callback.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 last_config_ = bad_config; | 235 last_config_ = bad_config; |
| 236 // No change, so no update. | 236 // No change, so no update. |
| 237 service_->InvalidateConfig(); | 237 service_->InvalidateConfig(); |
| 238 service_->OnConfigRead(config2); | 238 service_->OnConfigRead(config2); |
| 239 EXPECT_TRUE(last_config_.Equals(bad_config)); | 239 EXPECT_TRUE(last_config_.Equals(bad_config)); |
| 240 } | 240 } |
| 241 | 241 |
| 242 #if (defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN) | 242 #if (defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN) |
| 243 // TODO(szym): This is really an integration test and can time out if HOSTS is | 243 // TODO(szym): This is really an integration test and can time out if HOSTS is |
| 244 // huge. http://crbug.com/107810 | 244 // huge. http://crbug.com/107810 |
| 245 TEST_F(DnsConfigServiceTest, FLAKY_GetSystemConfig) { | 245 TEST_F(DnsConfigServiceTest, DISABLED_GetSystemConfig) { |
| 246 service_.reset(); | 246 service_.reset(); |
| 247 scoped_ptr<DnsConfigService> service(DnsConfigService::CreateSystemService()); | 247 scoped_ptr<DnsConfigService> service(DnsConfigService::CreateSystemService()); |
| 248 | 248 |
| 249 service->ReadConfig(base::Bind(&DnsConfigServiceTest::OnConfigChanged, | 249 service->ReadConfig(base::Bind(&DnsConfigServiceTest::OnConfigChanged, |
| 250 base::Unretained(this))); | 250 base::Unretained(this))); |
| 251 base::TimeDelta kTimeout = TestTimeouts::action_max_timeout(); | 251 base::TimeDelta kTimeout = TestTimeouts::action_max_timeout(); |
| 252 WaitForConfig(kTimeout); | 252 WaitForConfig(kTimeout); |
| 253 ASSERT_TRUE(last_config_.IsValid()) << "Did not receive DnsConfig in " << | 253 ASSERT_TRUE(last_config_.IsValid()) << "Did not receive DnsConfig in " << |
| 254 kTimeout.InSecondsF() << "s"; | 254 kTimeout.InSecondsF() << "s"; |
| 255 } | 255 } |
| 256 #endif // OS_POSIX || OS_WIN | 256 #endif // OS_POSIX || OS_WIN |
| 257 | 257 |
| 258 } // namespace net | 258 } // namespace net |
| 259 | 259 |
| OLD | NEW |