Data Reduction Proxy Interstitials

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 2046 matching lines @@
     SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)
   },
 #endif
   {
     "enable-touch-hover",
     IDS_FLAGS_ENABLE_TOUCH_HOVER_NAME,
     IDS_FLAGS_ENABLE_TOUCH_HOVER_DESCRIPTION,
     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
   // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
 };
 
 const Experiment* experiments = kExperiments;
 size_t num_experiments = arraysize(kExperiments);
 
 // Stores and encapsulates the little state that about:flags has.
@@ skipping 104 matching lines @@
   if (!strcmp("enable-data-reduction-proxy-dev", experiment.internal_name) &&
       chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_BETA &&
       chrome::VersionInfo::GetChannel() != 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) {
     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;
 }
 
 
 // Variant of GetSanitizedEnabledFlags that also removes any flags that aren't
 // enabled on the current platform.
 void GetSanitizedEnabledFlagsForCurrentPlatform(
     FlagsStorage* flags_storage, std::set<std::string>* result) {
@@ skipping 435 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags