Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(667)

Unified Diff: chrome/browser/net/dns_probe_browsertest.cc

Issue 2567623003: Make ERR_ICANN_NAME_COLLISION work for async DNS resolver. (Closed)
Patch Set: address Matt's comments Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/net/dns_probe_runner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/dns_probe_browsertest.cc
diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc
index cdc58ec4eb1061f11bb6695c8b0f152b4669b465..8729f8f8732e6b2a8a199f06bb1ebb69670c3f24 100644
--- a/chrome/browser/net/dns_probe_browsertest.cc
+++ b/chrome/browser/net/dns_probe_browsertest.cc
@@ -319,8 +319,8 @@ class DnsProbeBrowserTestIOThreadHelper {
void SetUpOnIOThread(IOThread* io_thread);
void CleanUpOnIOThreadAndDeleteHelper();
- void SetMockDnsClientRules(MockDnsClientRule::Result system_good_result,
- MockDnsClientRule::Result public_good_result);
+ void SetMockDnsClientRules(MockDnsClientRule::ResultType system_good_result,
+ MockDnsClientRule::ResultType public_good_result);
void SetCorrectionServiceNetError(int net_error);
void SetCorrectionServiceDelayRequests(bool delay_requests);
void SetRequestDestructionCallback(const base::Closure& callback);
@@ -382,8 +382,8 @@ void DnsProbeBrowserTestIOThreadHelper::CleanUpOnIOThreadAndDeleteHelper() {
}
void DnsProbeBrowserTestIOThreadHelper::SetMockDnsClientRules(
- MockDnsClientRule::Result system_result,
- MockDnsClientRule::Result public_result) {
+ MockDnsClientRule::ResultType system_result,
+ MockDnsClientRule::ResultType public_result) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DnsProbeService* service = io_thread_->globals()->dns_probe_service.get();
@@ -443,8 +443,8 @@ class DnsProbeBrowserTest : public InProcessBrowserTest {
void SetCorrectionServiceBroken(bool broken);
void SetCorrectionServiceDelayRequests(bool delay_requests);
void WaitForDelayedRequestDestruction();
- void SetMockDnsClientRules(MockDnsClientRule::Result system_result,
- MockDnsClientRule::Result public_result);
+ void SetMockDnsClientRules(MockDnsClientRule::ResultType system_result,
+ MockDnsClientRule::ResultType public_result);
// These functions are often used to wait for two navigations because two
// pages are loaded when navigation corrections are enabled: a blank page, so
@@ -583,8 +583,8 @@ void DnsProbeBrowserTest::NavigateToOtherError(int num_navigations) {
}
void DnsProbeBrowserTest::SetMockDnsClientRules(
- MockDnsClientRule::Result system_result,
- MockDnsClientRule::Result public_result) {
+ MockDnsClientRule::ResultType system_result,
+ MockDnsClientRule::ResultType public_result) {
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
Bind(&DnsProbeBrowserTestIOThreadHelper::SetMockDnsClientRules,
« no previous file with comments | « no previous file | chrome/browser/net/dns_probe_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698