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

1 files changed, 5 insertions, 1 deletions

diff --git a/net/proxy/proxy_resolver_mac.h b/net/proxy/proxy_resolver_mac.h
index 58f6096..6bad1d2 100644
--- a/net/proxy/proxy_resolver_mac.h
+++ b/net/proxy/proxy_resolver_mac.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "googleurl/src/gurl.h"
+#include "net/base/net_errors.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_resolver.h"
 
@@ -30,8 +31,11 @@ class ProxyResolverMac : public ProxyResolver {
   }
 
  private:
-  virtual void SetPacScriptByUrlInternal(const GURL& pac_url) {
+  virtual int SetPacScript(const GURL& pac_url,
+                           const std::string& /*pac_bytes*/,
+                           CompletionCallback* /*callback*/) {
     pac_url_ = pac_url;
+    return OK;
   }
 
   GURL pac_url_;