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

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc

Issue 848103002: AreDataReductionProxiesBypassed should use the DRP config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 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: components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc
index 8795af5a8ed5a9699b75c1e2cd93918c3d827f05..c712a158b5a8da1d01fa8e51df324cd7f9eea37f 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.cc
@@ -14,6 +14,7 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
#include "net/base/host_port_pair.h"
#include "net/http/http_response_headers.h"
+#include "net/proxy/proxy_config.h"
#include "net/proxy/proxy_retry_info.h"
#include "net/proxy/proxy_service.h"
#include "net/url_request/url_request_context.h"
@@ -293,6 +294,7 @@ class DailyDataSavingUpdate {
DataReductionProxyRequestType GetDataReductionProxyRequestType(
const net::URLRequest& request,
+ const net::ProxyConfig& data_reduction_proxy_config,
const DataReductionProxyParams& params) {
if (request.url().SchemeIs(url::kHttpsScheme))
return HTTPS;
@@ -301,7 +303,8 @@ DataReductionProxyRequestType GetDataReductionProxyRequestType(
return UNKNOWN_TYPE;
}
base::TimeDelta bypass_delay;
- if (params.AreDataReductionProxiesBypassed(request, &bypass_delay)) {
+ if (params.AreDataReductionProxiesBypassed(
+ request, data_reduction_proxy_config, &bypass_delay)) {
if (bypass_delay > base::TimeDelta::FromSeconds(kLongBypassDelayInSeconds))
return LONG_BYPASS;
return SHORT_BYPASS;

Powered by Google App Engine
This is Rietveld 408576698