Better match IE's proxy settings....

net/proxy/proxy_service.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_PROXY_PROXY_SERVICE_H_
 #define NET_PROXY_PROXY_SERVICE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 // TODO(eroman): remove this unused header; other callers are depending on it!
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "net/base/completion_callback.h"
 #include "net/proxy/proxy_server.h"
 #include "net/proxy/proxy_info.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class GURL;
 class MessageLoop;
 class URLRequestContext;
 
 namespace net {
 
-class ProxyScriptFetcher;
+class InitProxyResolver;
 class ProxyConfigService;
 class ProxyResolver;
+class ProxyScriptFetcher;
 
 // This class can be used to resolve the proxy server to use when loading a
 // HTTP(S) URL.  It uses the given ProxyResolver to handle the actual proxy
 // resolution.  See ProxyResolverV8 for example.
 class ProxyService {
  public:
   // The instance takes ownership of |config_service| and |resolver|.
   ProxyService(ProxyConfigService* config_service,
                ProxyResolver* resolver);
 
@@ skipping 118 matching lines @@
   // Checks to see if the proxy configuration changed, and then updates config_
   // to reference the new configuration.
   void UpdateConfig();
 
   // Assign |config| as the current configuration.
   void SetConfig(const ProxyConfig& config);
 
   // Tries to update the configuration if it hasn't been checked in a while.
   void UpdateConfigIfOld();
 
-  // Returns true if this ProxyService is downloading a PAC script on behalf
-  // of ProxyResolverWithoutFetch. Resolve requests will be frozen until
-  // the fetch has completed.
-  bool IsFetchingPacScript() const {
-    return in_progress_fetch_config_id_ != ProxyConfig::INVALID_ID;
+  // Returns true if the proxy resolver is being initialized for PAC
+  // (downloading PAC script(s) + testing).
+  // Resolve requests will be frozen until the initialization has completed.
+  bool IsInitializingProxyResolver() const {
+    return init_proxy_resolver_.get() != NULL;
   }
 
-  // Callback for when the PAC script has finished downloading.
-  void OnScriptFetchCompletion(int result);
+  // Callback for when the proxy resolver has been initialized with a
+  // PAC script.
+  void OnInitProxyResolverComplete(int result);
 
   // Returns ERR_IO_PENDING if the request cannot be completed synchronously.
   // Otherwise it fills |result| with the proxy information for |url|.
   // Completing synchronously means we don't need to query ProxyResolver.
   int TryToCompleteSynchronously(const GURL& url, ProxyInfo* result);
 
   // Set |result| with the proxy to use for |url|, based on |rules|.
   void ApplyProxyRules(const GURL& url,
                        const ProxyConfig::ProxyRules& rules,
                        ProxyInfo* result);
 
+  // Cancel all of the requests sent to the ProxyResolver. These will be
+  // restarted when calling ResumeAllPendingRequests().
+  void SuspendAllPendingRequests();
+
   // Sends all the unstarted pending requests off to the resolver.
   void ResumeAllPendingRequests();
 
   // Returns true if |pending_requests_| contains |req|.
   bool ContainsPendingRequest(PacRequest* req);
 
   // Removes |req| from the list of pending requests.
   void RemovePendingRequest(PacRequest* req);
 
-  // Returns true if the resolver is all set-up and ready to accept requests.
-  // Returns false if requests are blocked (because the PAC script is being
-  // downloaded). May have the side-effect of starting the PAC script
-  // download.
-  bool PrepareResolverForRequests();
-
   // Called to indicate that a PacRequest completed.  The |config_id| parameter
   // indicates the proxy configuration that was queried.  |result_code| is OK
   // if the PAC file could be downloaded and executed.  Otherwise, it is an
   // error code, indicating a bad proxy configuration.
   void DidCompletePacRequest(int config_id, int result_code);
 
   // Returns true if the URL passed in should not go through the proxy server.
   // 1. If the proxy settings say to bypass local names, and |IsLocalName(url)|.
   // 2. The URL matches one of the entities in the proxy bypass list.
   bool ShouldBypassProxyForURL(const GURL& url);
 
   // Returns true if |url| is to an intranet site (using non-FQDN as the
   // heuristic).
   static bool IsLocalName(const GURL& url);
 
+  // Helper to download the PAC script (wpad + custom) and apply fallback rules.
+  scoped_ptr<InitProxyResolver> init_proxy_resolver_;
+
   scoped_ptr<ProxyConfigService> config_service_;
   scoped_ptr<ProxyResolver> resolver_;
 
   // We store the proxy config and a counter (ID) that is incremented each time
   // the config changes.
   ProxyConfig config_;
 
   // Increasing ID to give to the next ProxyConfig that we set.
   int next_config_id_;
 
   // Indicates that the configuration is bad and should be ignored.
   bool config_is_bad_;
 
   // The time when the proxy configuration was last read from the system.
   base::TimeTicks config_last_update_time_;
 
   // Map of the known bad proxies and the information about the retry time.
   ProxyRetryInfoMap proxy_retry_info_;
 
   // Set of pending/inprogress requests.
   PendingRequests pending_requests_;
 
   // The fetcher to use when downloading PAC scripts for the ProxyResolver.
   // This dependency can be NULL if our ProxyResolver has no need for
   // external PAC script fetching.
   scoped_ptr<ProxyScriptFetcher> proxy_script_fetcher_;
 
-  // Callback for when |proxy_script_fetcher_| is done.
-  CompletionCallbackImpl<ProxyService> proxy_script_fetcher_callback_;
-
-  // The ID of the configuration for which we last downloaded a PAC script.
-  // If no PAC script has been fetched yet, will be ProxyConfig::INVALID_ID.
-  ProxyConfig::ID fetched_pac_config_id_;
-
-  // The error corresponding with |fetched_pac_config_id_|, or OK.
-  int fetched_pac_error_;
-
-  // The ID of the configuration for which we are currently downloading the
-  // PAC script. If no fetch is in progress, will be ProxyConfig::INVALID_ID.
-  ProxyConfig::ID in_progress_fetch_config_id_;
-
-  // The results of the current in progress fetch, or empty string.
-  std::string in_progress_fetch_bytes_;
-
+  // Callback for when |init_proxy_resolver_| is done.
+  CompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_;
   DISALLOW_COPY_AND_ASSIGN(ProxyService);
 };
 
 // Wrapper for invoking methods on a ProxyService synchronously.
 class SyncProxyServiceHelper
     : public base::RefCountedThreadSafe<SyncProxyServiceHelper> {
  public:
   SyncProxyServiceHelper(MessageLoop* io_message_loop,
                          ProxyService* proxy_service);
 
@@ skipping 11 matching lines @@
 
   base::WaitableEvent event_;
   CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
   ProxyInfo proxy_info_;
   int result_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_