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 1060 matching lines @@
      arraysize(kOmniboxUIVerticalMargin6px), nullptr},
     {"8px vertical margin", kOmniboxUIVerticalMargin8px,
      arraysize(kOmniboxUIVerticalMargin8px), nullptr},
     {"10px vertical margin", kOmniboxUIVerticalMargin10px,
      arraysize(kOmniboxUIVerticalMargin10px), nullptr},
     {"12px vertical margin", kOmniboxUIVerticalMargin12px,
      arraysize(kOmniboxUIVerticalMargin12px), nullptr},
     {"14px vertical margin", kOmniboxUIVerticalMargin14px,
      arraysize(kOmniboxUIVerticalMargin14px), nullptr}};
 
+const char kTopDocumentIsolationVariations_Ads_Value[] = {
+    '0' + static_cast<int>(features::TopDocumentIsolationMode::Ads), '\0'};

[Łukasz Anforowicz, 2017/06/30 15:28:36]

My opinion is that the code above is better than 1) hardcoding "1" (or was it
"2") here and/or 2) introducing ugly C++ templates (e.g. see
https://repl.it/JJAt/0).  FWIW, I am asking for a second opinion at
cxx@chromium.org DL
(https://groups.google.com/a/chromium.org/d/topic/cxx/W4pyzIQ1ksc/discussion).

[Charlie Reis, 2017/06/30 23:28:45]

Looks like you got this resolved.

+const FeatureEntry::FeatureParam kTopDocumentIsolationVariations_Ads[] = {
+    {features::kTopDocumentIsolationModeParam,
+     kTopDocumentIsolationVariations_Ads_Value}};
+
+const char kTopDocumentIsolationVariations_Xsite_Value[] = {
+    '0' + static_cast<int>(features::TopDocumentIsolationMode::Xsite), '\0'};
+const FeatureEntry::FeatureParam kTopDocumentIsolationVariations_Xsite[] = {
+    {features::kTopDocumentIsolationModeParam,
+     kTopDocumentIsolationVariations_Xsite_Value}};
+
+const FeatureEntry::FeatureVariation kTopDocumentIsolationVariations[] = {
+    {"(isolate ads detected by heuristics)",
+     kTopDocumentIsolationVariations_Ads,
+     arraysize(kTopDocumentIsolationVariations_Ads), nullptr},
+    {"(isolate all frames from site other than the top-level frame)",

[Łukasz Anforowicz, 2017/06/30 15:28:37]

The string above is concatenated with "Enabled " string.  See the CL description
for the 5 variations/options that this CL makes available for
TopDocumentIsolation's entry in chrome://flags. 

+     kTopDocumentIsolationVariations_Xsite,
+     arraysize(kTopDocumentIsolationVariations_Xsite), nullptr},
+};
+
 // 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 838 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_VALUE_TYPE(features::kTopDocumentIsolation)},
+     FEATURE_WITH_PARAMS_VALUE_TYPE(features::kTopDocumentIsolation,
+                                    kTopDocumentIsolationVariations,
+                                    "TopDocumentIsolation")},
     {"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 1387 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags