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 54 matching lines @@
 CONTENT_EXPORT extern const base::Feature kRenderingPipelineThrottling;
 CONTENT_EXPORT extern const base::Feature
     kRequireSecureOriginsForPepperMediaRequests;
 CONTENT_EXPORT extern const base::Feature kScrollAnchoring;
 CONTENT_EXPORT extern const base::Feature kServiceWorkerNavigationPreload;
 CONTENT_EXPORT extern const base::Feature kSharedArrayBuffer;
 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;
+
+CONTENT_EXPORT extern const char kTopDocumentIsolationModeParam[];
+
+// If TopDocumentIsolation is enabled, the mode for selecting *which* frames to
+// isolate can be one of the enum values below.
+enum class TopDocumentIsolationMode {
+  // Corresponds to "Enabled" state in chrome://flags (i.e. the user didn't
+  // select a more specific isolation mode).
+  Default = 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 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
+};
+

[Łukasz Anforowicz, 2017/07/01 00:10:53]

Charlie - do you have any thoughts on the location of the declarations
(kTopDocumentIsolationModeParam const and TopDocumentIsolationMode enum) above? 
Are they okay here?  Would you move them to another header?

Some of my earlier thoughts are in
https://codereview.chromium.org/2946113002/diff/80001/content/public/common/c...

 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 kWebGLImageChromium;
 CONTENT_EXPORT extern const base::Feature kWebPayments;
@@ skipping 22 matching lines @@
 #if defined(OS_MACOSX)
 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_