Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch....

net/proxy/proxy_service.h

 // Copyright (c) 2009 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>
 
@@ skipping 199 matching lines @@
 
   // 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);
 
-  // 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);
+  // Called when proxy resolution has completed (either synchronously or
+  // asynchronously). Handles logging the result, and cleaning out
+  // bad entries from the results list.
+  int DidFinishResolvingProxy(ProxyInfo* result,
+                              int result_code,
+                              LoadLog* load_log);
 
   // 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_;
 
   // Log from the *last* time |init_proxy_resolver_.Init()| was called, or NULL.
   scoped_refptr<LoadLog> init_proxy_resolver_log_;
 
   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_;
-
   // Indicates whether the ProxyResolver should be sent requests.
   bool should_use_proxy_resolver_;
 
   // 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.
@@ skipping 35 matching lines @@
 
   base::WaitableEvent event_;
   CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
   ProxyInfo proxy_info_;
   int result_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_