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 713f97b545ee5e6ce29fecefc0bb3579436fe104..bba94a13b1e3029b3bad1a2100c2096c92570542 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2105,6 +2105,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
@@ -2229,6 +2239,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() !=

[Lei Zhang, 2015/01/07 23:49:42]

If you don't mind, just call GetChannel() once and reuse the result in this
entire #if block.

[megjablon, 2015/01/12 22:01:58]

Done.

+          chrome::VersionInfo::CHANNEL_UNKNOWN &&
+      chrome::VersionInfo::GetChannel() !=
+          chrome::VersionInfo::CHANNEL_CANARY &&
+      chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
+    return true;
+  }
 #endif
 
   return false;