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

Unified Diff: components/data_reduction_proxy/core/common/data_reduction_proxy_params.h

Issue 2626963003: Remove kAllowed and kFallbackAllowed from data reduction proxy (Closed)
Patch Set: Addressed nits Created 3 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/common/data_reduction_proxy_params.h
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
index df639421ffa3d9175a4abccd4f1caf61c63e8c7e..f7bdf3b8ae33005167b97463d2441c6b0565b694 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.h
@@ -179,22 +179,13 @@ struct DataReductionProxyTypeInfo {
// Reduction Proxy.
class DataReductionProxyParams : public DataReductionProxyConfigValues {
public:
- // Flags used during construction that specify if the data reduction proxy
- // is allowed to be used, if the fallback proxy is allowed to be used, if the
- // promotion is allowed to be shown, and if this instance is part of a
- // holdback experiment.
- static const unsigned int kAllowed = (1 << 0);
- static const unsigned int kFallbackAllowed = (1 << 1);
- static const unsigned int kAllowAllProxyConfigurations =
- kAllowed | kFallbackAllowed;
+ // Flags used during construction that specify if the promotion is allowed to
+ // be shown, and if this instance is part of a holdback experiment.
static const unsigned int kPromoAllowed = (1 << 2);
static const unsigned int kHoldback = (1 << 3);
- // Constructs configuration parameters. If |kAllowed|, then the standard
- // data reduction proxy configuration is allowed to be used. If
- // |kfallbackAllowed| a fallback proxy can be used if the primary proxy is
- // bypassed or disabled. Finally if |kPromoAllowed|, the client may show a
- // promotion for the data reduction proxy.
+ // Constructs configuration parameters. If |kPromoAllowed|, the client may
+ // show a promotion for the data reduction proxy.
//
// A standard configuration has a primary proxy, and a fallback proxy for
// HTTP traffic.
@@ -210,10 +201,6 @@ class DataReductionProxyParams : public DataReductionProxyConfigValues {
const GURL& secure_proxy_check_url() const override;
- bool allowed() const override;
-
- bool fallback_allowed() const override;
-
bool promo_allowed() const override;
bool holdback() const override;
@@ -226,7 +213,7 @@ class DataReductionProxyParams : public DataReductionProxyConfigValues {
// Initialize the values of the proxies, and secure proxy check URL, from
// command line flags and preprocessor constants, and check that there are
// corresponding definitions for the allowed configurations.
- bool Init(bool allowed, bool fallback_allowed);
+ bool Init();
// Initialize the values of the proxies, and secure proxy check URL from
// command line flags and preprocessor constants.
@@ -246,13 +233,9 @@ class DataReductionProxyParams : public DataReductionProxyConfigValues {
GURL secure_proxy_check_url_;
- bool allowed_;
- bool fallback_allowed_;
bool promo_allowed_;
bool holdback_;
- bool configured_on_command_line_;
-
bool use_override_proxies_for_http_;
std::vector<DataReductionProxyServer> override_data_reduction_proxy_servers_;

Powered by Google App Engine
This is Rietveld 408576698