Add Finch experiment for selectively bypassing proxies.

net/proxy/proxy_service.h

 // Copyright (c) 2012 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 78 matching lines @@
     virtual Mode GetNextDelay(int initial_error,
                               base::TimeDelta current_delay,
                               base::TimeDelta* next_delay) const = 0;
   };
 
   // The instance takes ownership of |config_service| and |resolver|.
   // |net_log| is a possibly NULL destination to send log events to. It must
   // remain alive for the lifetime of this ProxyService.
   ProxyService(ProxyConfigService* config_service,
                ProxyResolver* resolver,
+               NetworkDelegate* network_delegate,

[mmenke, 2014/06/27 18:59:35]

Suggest making this an argument to ResolveProxy instead.  Allows one proxy
service to be reused by multiple URLRequestContexts.

[rcs, 2014/06/28 03:53:38]

Done.

                NetLog* net_log);
 
   virtual ~ProxyService();
 
   // Used internally to handle PAC queries.
   // TODO(eroman): consider naming this simply "Request".
   class PacRequest;
 
   // Returns ERR_IO_PENDING if the proxy information could not be provided
   // synchronously, to indicate that the result will be available when the
   // callback is run.  The callback is run on the thread that calls
   // ResolveProxy.
   //
   // The caller is responsible for ensuring that |results| and |callback|
   // remain valid until the callback is run or until |pac_request| is cancelled
   // via CancelPacRequest.  |pac_request| is only valid while the completion
   // callback is still pending. NULL can be passed for |pac_request| if
   // the caller will not need to cancel the request.
   //
   // We use the three possible proxy access types in the following order,
   // doing fallback if one doesn't work.  See "pac_script_decider.h"
   // for the specifics.
   //   1.  WPAD auto-detection
   //   2.  PAC URL
   //   3.  named proxy
   //
   // Profiling information for the request is saved to |net_log| if non-NULL.
   int ResolveProxy(const GURL& url,
+                   int load_flags,
                    ProxyInfo* results,
                    const net::CompletionCallback& callback,
                    PacRequest** pac_request,
                    const BoundNetLog& net_log);
 
   // This method is called after a failure to connect or resolve a host name.
   // It gives the proxy service an opportunity to reconsider the proxy to use.
   // The |results| parameter contains the results returned by an earlier call
   // to ResolveProxy.  The |net_error| parameter contains the network error
   // code associated with the failure. See "net/base/net_error_list.h" for a
@@ skipping 207 matching lines @@
   // starts initializing for it.
   void ApplyProxyConfigIfAvailable();
 
   // 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);
+  int TryToCompleteSynchronously(const GURL& url, int load_flags,
+                                 ProxyInfo* result);
 
   // Cancels all of the requests sent to the ProxyResolver. These will be
   // restarted when calling SetReady().
   void SuspendAllPendingRequests();
 
   // Advances the current state to |STATE_READY|, and resumes any pending
   // requests which had been stalled waiting for initialization to complete.
   void SetReady();
 
   // Returns true if |pending_requests_| contains |req|.
@@ skipping 72 matching lines @@
 
   // Helper to poll the PAC script for changes.
   scoped_ptr<ProxyScriptDeciderPoller> script_poller_;
 
   State current_state_;
 
   // Either OK or an ERR_* value indicating that a permanent error (e.g.
   // failed to fetch the PAC script) prevents proxy resolution.
   int permanent_error_;
 
+  // Network Delegate manages callbacks to be invoked for upon Proxy Resolution.

[mmenke, 2014/06/27 18:59:35]

nit:  "NetworkDelegate", "proxy resolution"

[rcs, 2014/06/28 03:53:38]

Done.

+  NetworkDelegate* network_delegate_;
+
   // This is the log where any events generated by |init_proxy_resolver_| are
   // sent to.
   NetLog* net_log_;
 
   // The earliest time at which we should run any proxy auto-config. (Used to
   // stall re-configuration following an IP address change).
   base::TimeTicks stall_proxy_autoconfig_until_;
 
   // The amount of time to stall requests following IP address changes.
   base::TimeDelta stall_proxy_auto_config_delay_;
@@ skipping 36 matching lines @@
 
   base::WaitableEvent event_;
   CompletionCallback callback_;
   ProxyInfo proxy_info_;
   int result_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_