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 b002070e002b7313bb121eb505719d4325b574dd..970aaca62690156cfd86ff60fc95392881e510e6 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2121,7 +2121,6 @@ const Experiment kExperiments[] = {
     kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec)
   },
-
   {
     "mark-non-secure-as",  // FLAGS:RECORD_UMA
      IDS_MARK_NON_SECURE_AS_NAME,
@@ -2129,7 +2128,6 @@ const Experiment kExperiments[] = {
      kOsAll,
      MULTI_VALUE_TYPE(kMarkNonSecureAsChoices)
   },
-
   {
     "enable-site-per-process",
     IDS_FLAGS_ENABLE_SITE_PER_PROCESS_NAME,
@@ -2155,6 +2153,16 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(chromeos::switches::kEnableTimeZoneTrackingOption)
   },
 #endif  // defined(OS_CHROMEOS)
+#if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
+  {
+    "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
@@ -2268,15 +2276,28 @@ bool SkipConditionalExperiment(const Experiment& experiment,
   }
 
 #if defined(OS_ANDROID)
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   // enable-data-reduction-proxy-dev is only available for the Dev/Beta channel.
   if (!strcmp("enable-data-reduction-proxy-dev", experiment.internal_name) &&
-      chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_BETA &&
-      chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
+      channel != chrome::VersionInfo::CHANNEL_BETA &&
+      channel != chrome::VersionInfo::CHANNEL_DEV) {
     return true;
   }
   // enable-data-reduction-proxy-alt is only available for the Dev channel.
   if (!strcmp("enable-data-reduction-proxy-alt", experiment.internal_name) &&
-      chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
+      channel != chrome::VersionInfo::CHANNEL_DEV) {
+    return true;
+  }
+#endif
+#if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)

[bengr, 2015/02/05 00:23:46]

Add a blank line above this line.

[megjablon, 2015/02/07 05:15:13]

Done.

+  chrome::VersionInfo::Channel channel2 = chrome::VersionInfo::GetChannel();
+  // 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) &&
+      channel2 != chrome::VersionInfo::CHANNEL_UNKNOWN &&
+      channel2 != chrome::VersionInfo::CHANNEL_CANARY &&
+      channel2 != chrome::VersionInfo::CHANNEL_DEV) {
     return true;
   }
 #endif