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-27 16:42:20 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-27 16:42:20 +0000
commit2bd6ca1c42b1c5f3dfe1734a49c697adc22246f6 (patch)
treea7aba3f6a60e08bf29d2cc90e2d343f3530b812c /chrome/test/in_process_browser_test.cc
parentd1fda80b9254869bab3ca816c135088c9724970e (diff)
downloadchromium_src-2bd6ca1c42b1c5f3dfe1734a49c697adc22246f6.zip
chromium_src-2bd6ca1c42b1c5f3dfe1734a49c697adc22246f6.tar.gz
chromium_src-2bd6ca1c42b1c5f3dfe1734a49c697adc22246f6.tar.bz2
Revert r24606-24607. The tree didn't like them. :(
TBR=darin Review URL: http://codereview.chromium.org/173574 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.cc')
-rw-r--r--chrome/test/in_process_browser_test.cc3
1 files changed, 3 insertions, 0 deletions
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");