Revert of Use FrameIsAd to decide whether to isolate a frame in TopDocumentIsolation mode.

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 1085 matching lines @@
          arraysize(kClientPlaceholdersForServerLoFiEnabled), nullptr}};
 
 const FeatureEntry::Choice kAsyncImageDecodingChoices[] = {
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
      cc::switches::kEnableCheckerImaging, ""},
     {flags_ui::kGenericExperimentChoiceDisabled,
      cc::switches::kDisableCheckerImaging, ""},
 };
 
-#define DEFINE_TDI_MODE_FEATURE_PARAM(name, value, description)               \
-  const FeatureEntry::FeatureParam kTopDocumentIsolationVariations_##name[] = \
-      {{features::kTopDocumentIsolationModeParam, #value}};
-FOR_EACH_TDI_MODE(DEFINE_TDI_MODE_FEATURE_PARAM)
-#undef DEFINE_TDI_MODE_FEATURE_PARAM
-
-const FeatureEntry::FeatureVariation kTopDocumentIsolationVariations[] = {
-#define DEFINE_TDI_MODE_VARIATION(name, value, description)                 \
-  {"(" #name " - " description ")", kTopDocumentIsolationVariations_##name, \
-   arraysize(kTopDocumentIsolationVariations_##name), nullptr},
-    FOR_EACH_TDI_MODE(DEFINE_TDI_MODE_VARIATION)
-#undef DEFINE_TDI_MODE_VARIATION
-};
-
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the entry is the internal name.
 //
 // To add a new entry, add to the end of kFeatureEntries. There are two
 // distinct types of entries:
 // . SINGLE_VALUE: entry is either on or off. Use the SINGLE_VALUE_TYPE
 //   macro for this type supplying the command line to the macro.
 // . MULTI_VALUE: a list of choices, the first of which should correspond to a
 //   deactivated state for this lab (i.e. no command line option).  To specify
@@ skipping 842 matching lines @@
      MULTI_VALUE_TYPE(kMarkHttpAsChoices)},
     {"enable-http-form-warning", flag_descriptions::kEnableHttpFormWarningName,
      flag_descriptions::kEnableHttpFormWarningDescription, kOsAll,
      FEATURE_VALUE_TYPE(security_state::kHttpFormWarningFeature)},
     {"enable-site-per-process", flag_descriptions::kSitePerProcessName,
      flag_descriptions::kSitePerProcessDescription, kOsAll,
      SINGLE_VALUE_TYPE(switches::kSitePerProcess)},
     {"enable-top-document-isolation",
      flag_descriptions::kTopDocumentIsolationName,
      flag_descriptions::kTopDocumentIsolationDescription, kOsAll,
-     FEATURE_WITH_PARAMS_VALUE_TYPE(features::kTopDocumentIsolation,
-                                    kTopDocumentIsolationVariations,
-                                    "TopDocumentIsolation")},
+     FEATURE_VALUE_TYPE(features::kTopDocumentIsolation)},
     {"enable-use-zoom-for-dsf", flag_descriptions::kEnableUseZoomForDsfName,
      flag_descriptions::kEnableUseZoomForDsfDescription, kOsAll,
      MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)},
 #if defined(OS_MACOSX)
     {"enable-harfbuzz-rendertext", flag_descriptions::kHarfbuzzRendertextName,
      flag_descriptions::kHarfbuzzRendertextDescription, kOsMac,
      SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText)},
 #endif  // OS_MACOSX
     {"data-reduction-proxy-lo-fi",
      flag_descriptions::kDataReductionProxyLoFiName,
@@ skipping 1451 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags