| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 7691beb1d656137a7a121bd9aa7824236a71cd44..b6a45b66b74d3f1083603aa4c7128f60cf746fb5 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -1470,11 +1470,6 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_DESCRIPTION, kOsAll,
|
| SINGLE_VALUE_TYPE(
|
| data_reduction_proxy::switches::kClearDataReductionProxyDataSavings)},
|
| - {"enable-data-reduction-proxy-config-client",
|
| - IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_NAME,
|
| - IDS_FLAGS_DATA_REDUCTION_PROXY_CONFIG_CLIENT_DESCRIPTION, kOsAll,
|
| - SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
|
| - kEnableDataReductionProxyConfigClient)},
|
| {"allow-insecure-localhost", IDS_ALLOW_INSECURE_LOCALHOST,
|
| IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, kOsAll,
|
| SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)},
|
| @@ -1908,16 +1903,6 @@ bool SkipConditionalFeatureEntry(const FeatureEntry& entry) {
|
| return true;
|
| }
|
|
|
| - // enable-data-reduction-proxy-config-client is only available for Chromium
|
| - // builds and the Canary/Dev channels.
|
| - if (!strcmp("enable-data-reduction-proxy-config-client",
|
| - entry.internal_name) &&
|
| - channel != version_info::Channel::DEV &&
|
| - channel != version_info::Channel::CANARY &&
|
| - channel != version_info::Channel::UNKNOWN) {
|
| - return true;
|
| - }
|
| -
|
| return false;
|
| }
|
|
|
|
|