summaryrefslogtreecommitdiffstats
path: root/chrome/test/in_process_browser_test.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-15 00:02:40 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-15 00:02:40 +0000
commitb7a20d363af744159a2bb85bfe3db027d2d4819e (patch)
tree14a363b284d4456d6c0a4888a6b944af3e10b490 /chrome/test/in_process_browser_test.cc
parent3f58d855ccb7c29abd2fd73cb60e11089abe8dd1 (diff)
downloadchromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.zip
chromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.tar.gz
chromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.tar.bz2
Convert parts of errorpage_uitest.cc to be not flaky.
TEST=Covered by browser_tests. http://crbug.com/19361, http://crbug.com/19395 Review URL: http://codereview.chromium.org/169002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.cc')
-rw-r--r--chrome/test/in_process_browser_test.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 6c07e41..0c58c55 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -243,7 +243,12 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
void InProcessBrowserTest::ConfigureHostResolverProc(
net::RuleBasedHostResolverProc* host_resolver_proc) {
+ // 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");