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

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 63f3b45a429f4ee72e1e5d6bb217c0c690fe77b6..ef5f554a0a6ea352619117d67d440d82b40aa05f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1101,20 +1101,6 @@
      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:
@@ -1979,9 +1965,7 @@
     {"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)},