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 2137 matching lines @@
     SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)
   },
 #endif
   {
     "enable-delay-agnostic-aec",
     IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME,
     IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION,
     kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec)
   },
-
   {
     "mark-non-secure-as",  // FLAGS:RECORD_UMA
      IDS_MARK_NON_SECURE_AS_NAME,
      IDS_MARK_NON_SECURE_AS_DESCRIPTION,
      kOsAll,
      MULTI_VALUE_TYPE(kMarkNonSecureAsChoices)
   },
-
   {
     "enable-site-per-process",
     IDS_FLAGS_ENABLE_SITE_PER_PROCESS_NAME,
     IDS_FLAGS_ENABLE_SITE_PER_PROCESS_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kSitePerProcess)
   },
 #if defined(OS_MACOSX)
   {
     "enable-harfbuzz-rendertext",
@@ skipping 13 matching lines @@
   },
 #endif  // defined(OS_CHROMEOS)
   {
     "enable-data-reduction-proxy-lo-fi",
     IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_NAME,
     IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
                       kEnableDataReductionProxyLoFi)
   },
+#if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
+  {
+    "enable-data-reduction-proxy-bypass-warnings",
+    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 93 matching lines @@
 
 bool SkipConditionalExperiment(const Experiment& experiment,
                                FlagsStorage* flags_storage) {
   if ((experiment.internal_name == std::string("manual-enhanced-bookmarks")) ||
       (experiment.internal_name ==
            std::string("manual-enhanced-bookmarks-optout"))) {
     return true;
   }
 
 #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;
   }
   // enable-data-reduction-proxy-lo-fi is only available for Chromium builds and
   // the Canary/Dev channel.
   if (!strcmp("enable-data-reduction-proxy-lo-fi", experiment.internal_name) &&
-      chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV &&
-      chrome::VersionInfo::GetChannel() !=
-          chrome::VersionInfo::CHANNEL_CANARY &&
-      chrome::VersionInfo::GetChannel() !=
-          chrome::VersionInfo::CHANNEL_UNKNOWN) {
+      channel != chrome::VersionInfo::CHANNEL_DEV &&
+      channel != chrome::VersionInfo::CHANNEL_CANARY &&
+      channel != chrome::VersionInfo::CHANNEL_UNKNOWN) {
     return true;
   }
 #endif
+
+#if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
+  chrome::VersionInfo::Channel channel2 = chrome::VersionInfo::GetChannel();

[Lei Zhang, 2015/02/13 20:11:11]

I would just do:
#if defined(OS_ANDROID) || defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
#endif
#if defined(OS_ANDROID)
...
#endif

#if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
...
#endif

[megjablon, 2015/02/13 21:21:17]

Done.

+  // enable-data-reduction-proxy-bypass-warning is only available for Chromium
+  // builds and Canary/Dev channel.
+  if (!strcmp("enable-data-reduction-proxy-bypass-warnings",
+              experiment.internal_name) &&
+      channel2 != chrome::VersionInfo::CHANNEL_UNKNOWN &&
+      channel2 != chrome::VersionInfo::CHANNEL_CANARY &&
+      channel2 != 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) {
   GetSanitizedEnabledFlags(flags_storage, result);
@@ skipping 434 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags