diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 23:36:46 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 23:36:46 +0000 |
| commit | ffc90a1e716e6bbc54eb719862a1fd7932d53510 (patch) | |
| tree | 3c1673e39b2b8d52aa682a361ef8346ffd0f1144 /chrome/test | |
| parent | a173cc9be851b100258d23771ecbee00cc9f44e1 (diff) | |
| download | chromium_src-ffc90a1e716e6bbc54eb719862a1fd7932d53510.zip chromium_src-ffc90a1e716e6bbc54eb719862a1fd7932d53510.tar.gz chromium_src-ffc90a1e716e6bbc54eb719862a1fd7932d53510.tar.bz2 | |
Revert "Mock the LinkDoctor for tests. Should greatly decrease ErrorPage test flakiness."
TBR=darin
Review URL: http://codereview.chromium.org/173165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/mock-link-doctor.html | 4 | ||||
| -rw-r--r-- | chrome/test/data/mock-link-doctor.html.mock-http-headers | 2 | ||||
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 3 |
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 629525b..0c58c55 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -246,6 +246,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"); |