From 620f57148c311c4dc2cf680a4a5861fbdcd29993 Mon Sep 17 00:00:00 2001 From: "ericroman@google.com" Date: Tue, 4 Aug 2009 22:43:12 +0000 Subject: Better match IE's proxy settings. * When BOTH autodetect and custom PAC script are given, try both. * Use successful PAC parsing as the heuristic for determining when a script is valid (rather than first-request). * Only apply the proxy bypass list when using non-PAC. The high level explanation on how this works: http://sites.google.com/a/chromium.org/dev/developers/design-documents/proxy-settings-fallback BUG= http://crbug.com/18271, http://crbug.com/9985 TEST=unit tests. Review URL: http://codereview.chromium.org/160510 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22430 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_script_fetcher_unittest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'net/proxy/proxy_script_fetcher_unittest.cc') diff --git a/net/proxy/proxy_script_fetcher_unittest.cc b/net/proxy/proxy_script_fetcher_unittest.cc index 8a8030b..6dd05dc 100644 --- a/net/proxy/proxy_script_fetcher_unittest.cc +++ b/net/proxy/proxy_script_fetcher_unittest.cc @@ -62,7 +62,8 @@ class SynchFetcherThreadHelper { // Starts fetching the script at |url|. Upon completion |event_| will be // signalled, and the bytes read will have been written to |fetch_result_|. void Start(const GURL& url) { - fetcher_->Fetch(url, &fetch_result_->bytes, &callback_); + int rv = fetcher_->Fetch(url, &fetch_result_->bytes, &callback_); + EXPECT_EQ(net::ERR_IO_PENDING, rv); } void OnFetchCompletion(int result) { -- cgit v1.1