| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 6d59ddac1b904494c6acaf695eea1c8d47050ad2..d6dedb8ac0fbb4a7fe625f8ec0a81e986024351f 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -2097,6 +2097,16 @@ const Experiment kExperiments[] = {
|
| SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)
|
| },
|
| #endif
|
| +#if defined(OS_ANDROID)
|
| + {
|
| + "enable-data-reduction-proxy-bypass-warning",
|
| + IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_NAME,
|
| + IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_DESCRIPTION,
|
| + kOsAndroid,
|
| + SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
|
| + kEnableDataReductionProxyBypassWarning)
|
| + },
|
| +#endif
|
|
|
| // NOTE: Adding new command-line switches requires adding corresponding
|
| // entries to enum "LoginCustomFlags" in histograms.xml. See note in
|
| @@ -2221,6 +2231,17 @@ bool SkipConditionalExperiment(const Experiment& experiment,
|
| chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
|
| return true;
|
| }
|
| + // enable-data-reduction-proxy-bypass-warning is only available for Chromium
|
| + // builds and Canary/Dev channel.
|
| + if (!strcmp("enable-data-reduction-proxy-bypass-warning",
|
| + experiment.internal_name) &&
|
| + chrome::VersionInfo::GetChannel() !=
|
| + chrome::VersionInfo::CHANNEL_UNKNOWN &&
|
| + chrome::VersionInfo::GetChannel() !=
|
| + chrome::VersionInfo::CHANNEL_CANARY &&
|
| + chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
|
| + return true;
|
| + }
|
| #endif
|
|
|
| return false;
|
|
|