summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/mock-link-doctor.html4
-rw-r--r--chrome/test/data/mock-link-doctor.html.mock-http-headers2
-rw-r--r--chrome/test/in_process_browser_test.cc3
3 files changed, 3 insertions, 6 deletions
diff --git a/chrome/test/data/mock-link-doctor.html b/chrome/test/data/mock-link-doctor.html
deleted file mode 100644
index e1e12a3..0000000
--- a/chrome/test/data/mock-link-doctor.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<head><title>Mock Link Doctor</title></head>
-<body></body>
-</html>
diff --git a/chrome/test/data/mock-link-doctor.html.mock-http-headers b/chrome/test/data/mock-link-doctor.html.mock-http-headers
deleted file mode 100644
index 57fae25..0000000
--- a/chrome/test/data/mock-link-doctor.html.mock-http-headers
+++ /dev/null
@@ -1,2 +0,0 @@
-HTTP/1.0 200 OK
-Content-type: text/html
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 27093004..c217632 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -241,6 +241,9 @@ void InProcessBrowserTest::ConfigureHostResolverProc(
// TODO(phajdan.jr): remove, http://crbug.com/2635
host_resolver_proc->AllowDirectLookup("*.google.com");
+ // TODO(phajdan.jr): remove, http://crbug.com/18365
+ host_resolver_proc->AllowDirectLookup("*.gstatic.com");
+
// See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
// We don't want the test code to use it.
host_resolver_proc->AddSimulatedFailure("wpad");