Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index 407bbaf739e7cae213075378b6313e2f9e5cb6c4..0a343ca5406545fad42470060d0673898381d701 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -2071,6 +2071,16 @@ const Experiment kExperiments[] = { |
ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableFillOnAccountSelect, |
autofill::switches::kDisableFillOnAccountSelect) |
}, |
+#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 |
@@ -2195,6 +2205,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; |