Data Reduction Proxy Interstitials

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 1a873afdbcf58be69821bf6f9e640c7ad364049b..89e623c2d88bb5c8f04d1eec7b1e477dbe482c18 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2064,6 +2064,16 @@ const Experiment kExperiments[] = {
     kOsAndroid,
     SINGLE_VALUE_TYPE("enable-touch-hover")
   },
+#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
@@ -2188,6 +2198,17 @@ bool SkipConditionalExperiment(const Experiment& experiment,
       chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
     return true;
   }
+  // enable-data-reduction-proxy-alt is only available for the Chromium builds

[bengr, 2014/12/17 00:30:19]

Fix the comment.

[megjablon, 2014/12/23 02:18:02]

Done.

+  // 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;