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

content/public/common/content_features.h

Index: content/public/common/content_features.h
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
index 7ee19ae40f9dc5e9487309f15732dd4d8d10e8a3..105f14951656fdb88a79739988f6de8434ecc224 100644
--- a/content/public/common/content_features.h
+++ b/content/public/common/content_features.h
@@ -71,7 +71,30 @@ 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

[Charlie Reis, 2017/07/06 20:02:29]

nit: Let's be a bit more specific:
If the kTopDocumentIsolation base::Feature is enabled, the values of this enum
represent the mode for selecting *which* frames to isolate.

[Łukasz Anforowicz, 2017/07/06 20:41:58]

Done.  I've also tweaked the comments for kTopDocumentIsolationModeParam and for
TopDocumentIsolationMode::Unspecified.

+// 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,

[Charlie Reis, 2017/07/06 20:02:29]

Are there any constraints on this name?  I'm wondering if we can say something
like Unspecified to distinguish it from the "Default" value from base::Feature. 
That would help cut down on my confusion.

[Łukasz Anforowicz, 2017/07/06 20:41:58]

No constraints.  I've renamed to Unspecified.

+
+// 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")

[Charlie Reis, 2017/07/06 20:02:29]

nit: "isolate only cross-site ads detected by heurisitcs"

[Łukasz Anforowicz, 2017/07/06 20:41:58]

Done.

+
+#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;