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

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h

Issue 1123173004: Do not disable Data Reduction Proxy on VPN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to head Created 5 years, 7 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
« no previous file with comments | « no previous file | components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
index f9b83c1e8fe280047e2572c4f8e7e69b0f88121d..2fc3bdbba07610201c11e0bd654f5ccc3773728d 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h
@@ -242,6 +242,10 @@ class DataReductionProxyConfig
AreProxiesBypassed);
FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigTest,
AreProxiesBypassedRetryDelay);
+ FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigTest,
+ TestMaybeDisableIfVPNTrialDisabled);
+ FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigTest,
+ TestMaybeDisableIfVPNTrialEnabled);
// NetworkChangeNotifier::IPAddressObserver:
void OnIPAddressChanged() override;
@@ -267,9 +271,10 @@ class DataReductionProxyConfig
// Adds the default proxy bypass rules for the Data Reduction Proxy.
void AddDefaultProxyBypassRules();
- // Disables use of the Data Reduction Proxy on VPNs. Returns true if the
- // Data Reduction Proxy has been disabled.
- bool DisableIfVPN();
+ // Disables use of the Data Reduction Proxy on VPNs if client is not in the
+ // DataReductionProxyUseDataSaverOnVPN field trial and a TUN network interface
+ // is being used. Returns true if the Data Reduction Proxy has been disabled.
+ bool MaybeDisableIfVPN();
// Checks if all configured data reduction proxies are in the retry map.
// Returns true if the request is bypassed by all configured data reduction
« no previous file with comments | « no previous file | components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698