Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h |
index 4e45dffd9578667267ff1b557b80f6150648d0f8..2cf620340164537d9e82fc56792b35d07b2befe2 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h |
@@ -1,17 +1,19 @@ |
// Copyright 2014 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 COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_DELEGATE_H_ |
#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_DELEGATE_H_ |
+#include <string> |
+ |
#include "base/macros.h" |
#include "net/base/proxy_delegate.h" |
#include "net/proxy/proxy_retry_info.h" |
#include "url/gurl.h" |
namespace net { |
class HostPortPair; |
class HttpRequestHeaders; |
class HttpResponseHeaders; |
class NetLog; |
@@ -41,20 +43,21 @@ class DataReductionProxyDelegate : public net::ProxyDelegate { |
DataReductionProxyEventCreator* event_creator, |
DataReductionProxyBypassStats* bypass_stats, |
net::NetLog* net_log); |
~DataReductionProxyDelegate() override; |
// net::ProxyDelegate implementation: |
void OnResolveProxy(const GURL& url, |
int load_flags, |
const net::ProxyService& proxy_service, |
+ const std::string& method, |
bengr
2016/02/16 20:00:13
Move the method to just after the url.
RyanSturm
2016/02/17 21:46:10
Done.
|
net::ProxyInfo* result) override; |
void OnFallback(const net::ProxyServer& bad_proxy, int net_error) override; |
void OnBeforeSendHeaders(net::URLRequest* request, |
const net::ProxyInfo& proxy_info, |
net::HttpRequestHeaders* headers) override; |
void OnBeforeTunnelRequest(const net::HostPortPair& proxy_server, |
net::HttpRequestHeaders* extra_headers) override; |
void OnTunnelConnectCompleted(const net::HostPortPair& endpoint, |
const net::HostPortPair& proxy_server, |
int net_error) override; |
@@ -78,14 +81,15 @@ class DataReductionProxyDelegate : public net::ProxyDelegate { |
// Adds data reduction proxies to |result|, where applicable, if result |
// otherwise uses a direct connection for |url|, and the data reduction proxy is |
// not bypassed. Also, configures |result| to proceed directly to the origin if |
// |result|'s current proxy is the data reduction proxy |
// This is visible for test purposes. |
void OnResolveProxyHandler(const GURL& url, |
int load_flags, |
const net::ProxyConfig& data_reduction_proxy_config, |
const net::ProxyRetryInfoMap& proxy_retry_info, |
const DataReductionProxyConfig* config, |
+ const std::string& method, |
bengr
2016/02/16 20:00:13
Move the method to just after the url.
RyanSturm
2016/02/17 21:46:10
Done.
|
net::ProxyInfo* result); |
} // namespace data_reduction_proxy |
#endif // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_DELEGATE_H_ |