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

content/public/common/content_features.h

 // Copyright 2015 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.
 
 // This file defines all the public base::FeatureList features for the content
 // module.
 
 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_FEATURES_H_
 #define CONTENT_PUBLIC_COMMON_CONTENT_FEATURES_H_
 
@@ skipping 59 matching lines @@
 CONTENT_EXPORT extern const base::Feature kResourceLoadScheduler;
 CONTENT_EXPORT extern const base::Feature kScrollAnchoring;
 CONTENT_EXPORT extern const base::Feature kServiceWorkerNavigationPreload;
 CONTENT_EXPORT extern const base::Feature kServiceWorkerScriptStreaming;
 CONTENT_EXPORT extern const base::Feature kSharedArrayBuffer;
 CONTENT_EXPORT extern const base::Feature kSignInProcessIsolation;
 CONTENT_EXPORT extern const base::Feature kSkipCompositingSmallScrollers;
 CONTENT_EXPORT extern const base::Feature kSlimmingPaintInvalidation;
 CONTENT_EXPORT extern const base::Feature kTimerThrottlingForHiddenFrames;
 CONTENT_EXPORT extern const base::Feature kTokenBinding;
-
 CONTENT_EXPORT extern const base::Feature kTopDocumentIsolation;
-
-// If the kTopDocumentIsolation base::Feature is enabled, then it can be
-// configured by additional parameters (see also GetFieldTrialParamsByFeature).
-// |kTopDocumentIsolationModeParam| is the name of an optional parameter that
-// specifies TopDocumentIsolationMode.  Valid values of this parameter are
-// strings that represent numeric values of TopDocumentIsolationMode enum values
-// (e.g. "1" for TopDocumentIsolationMode::CrossSite).
-CONTENT_EXPORT extern const char kTopDocumentIsolationModeParam[];
-
-// If the kTopDocumentIsolation base::Feature is enabled, the values of this
-// enum represent the mode for selecting *which* frames to isolate.
-//
-// These values should NOT be renumbered, because 1) they can be specified in a
-// server-side trial config and 2) they can be persisted in the state of
-// chrome://flags selected by the user.
-enum class TopDocumentIsolationMode {
-  // This value indicates that kTopDocumentIsolationModeParam was not specified.
-  // Corresponds to "Enabled" state in chrome://flags (i.e. the user didn't
-  // select a more specific isolation mode).
-  Unspecified = 0,
-
-// Each of the modes below corresponds to "Enabled (<name> - <description>)"
-// state in chrome://flags.
-#define FOR_EACH_TDI_MODE(V)                                        \
-  V(CrossSite, 1,                                                   \
-    "isolate all frames from sites other than the top-level frame") \
-  V(Ads, 2, "isolate only cross-site ads detected by heuristics")
-
-#define DEFINE_TDI_MODE_ENUM_VALUE(name, value, description) name = value,
-  FOR_EACH_TDI_MODE(DEFINE_TDI_MODE_ENUM_VALUE)
-#undef DEFINE_TDI_MODE_ENUM_VALUE
-};
-
 CONTENT_EXPORT extern const base::Feature kTouchpadAndWheelScrollLatching;
 CONTENT_EXPORT extern const base::Feature kUseFeaturePolicyForPermissions;
 CONTENT_EXPORT extern const base::Feature kUseMojoAudioOutputStreamFactory;
 CONTENT_EXPORT extern const base::Feature kVibrateRequiresUserGesture;
 CONTENT_EXPORT extern const base::Feature kVrShell;
 CONTENT_EXPORT extern const base::Feature kWebAssembly;
 CONTENT_EXPORT extern const base::Feature kWebAssemblyStreaming;
 CONTENT_EXPORT extern const base::Feature kWebAssemblyTrapHandler;
 CONTENT_EXPORT extern const base::Feature kWebAuth;
 CONTENT_EXPORT extern const base::Feature kWebGLImageChromium;
@@ skipping 24 matching lines @@
 CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac;
 CONTENT_EXPORT extern const base::Feature kMacV2Sandbox;
 #endif  // defined(OS_MACOSX)
 
 // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in
 // alphabetical order, or in one of the ifdefs (also in order in each section).
 
 }  // namespace features
 
 #endif  // CONTENT_PUBLIC_COMMON_CONTENT_FEATURES_H_