Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: net/proxy/proxy_service.h

Issue 1684123004: Bypass the DataReductionProxy for all POST requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resubmitting with upstream branch set to branch from issue 1680893002 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/proxy/proxy_service.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 377cde35aabba47b4abfe772d690e06ac015ba82..23815685c148c43b9b8f13450af9a270f749998f 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -125,28 +125,30 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// 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 CompletionCallback& callback,
PacRequest** pac_request,
ProxyDelegate* proxy_delegate,
+ const std::string& method,
bengr 2016/02/16 20:00:14 Move the method to just after the url.
RyanSturm 2016/02/17 21:46:12 Done.
const BoundNetLog& net_log);
// Returns true if the proxy information could be determined without spawning
// an asynchronous task. Otherwise, |result| is unmodified.
bool TryResolveProxySynchronously(const GURL& raw_url,
int load_flags,
ProxyInfo* result,
ProxyDelegate* proxy_delegate,
+ const std::string& method,
bengr 2016/02/16 20:00:14 Move the method to just after the url.
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
// list of possible values. The semantics of this call are otherwise
// similar to ResolveProxy.
//
@@ -156,20 +158,21 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// Returns ERR_FAILED if there is not another proxy config to try.
//
// Profiling information for the request is saved to |net_log| if non-NULL.
int ReconsiderProxyAfterError(const GURL& url,
int load_flags,
int net_error,
ProxyInfo* results,
const CompletionCallback& callback,
PacRequest** pac_request,
ProxyDelegate* proxy_delegate,
bengr 2016/02/16 20:00:14 Move the method to just after the url.
RyanSturm 2016/02/17 21:46:12 Done.
+ const std::string& method,
const BoundNetLog& net_log);
// Explicitly trigger proxy fallback for the given |results| by updating our
// list of bad proxies to include the first entry of |results|, and,
// additional bad proxies (can be none). Will retry after |retry_delay| if
// positive, and will use the default proxy retry duration otherwise. Proxies
// marked as bad will not be retried until |retry_delay| has passed. Returns
// true if there will be at least one proxy remaining in the list after
// fallback and false otherwise. This method should be used to add proxies to
// the bad proxy list only for reasons other than a network error. If a proxy
@@ -331,20 +334,21 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// Identical to ResolveProxy, except that |callback| is permitted to be null.
// if |callback.is_null()|, this function becomes a thin wrapper around
// |TryToCompleteSynchronously|.
int ResolveProxyHelper(const GURL& url,
int load_flags,
ProxyInfo* results,
const CompletionCallback& callback,
PacRequest** pac_request,
ProxyDelegate* proxy_delegate,
+ const std::string& method,
bengr 2016/02/16 20:00:14 Move the method to just after the url.
RyanSturm 2016/02/17 21:46:12 Done.
const BoundNetLog& net_log);
// 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();
@@ -353,20 +357,21 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// Removes |req| from the list of pending requests.
void RemovePendingRequest(PacRequest* req);
// 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(const GURL& url,
int load_flags,
ProxyDelegate* proxy_delegate,
+ const std::string& method,
bengr 2016/02/16 20:00:14 Move the method to just after the url.
RyanSturm 2016/02/17 21:46:12 Done.
ProxyInfo* result,
int result_code,
const BoundNetLog& net_log,
base::TimeTicks start_time,
bool script_executed);
// Start initialization using |fetched_config_|.
void InitializeUsingLastFetchedConfig();
// Start the initialization skipping past the "decision" phase.

Powered by Google App Engine
This is Rietveld 408576698