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

content/public/test/test_utils.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 "content/public/test/test_utils.h"
 
+#include <map>
+#include <set>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/variations/variations_params_manager.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/url_schemes.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
 #include "content/public/test/test_launcher.h"
 #include "content/public/test/test_service_manager_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/url_util.h"
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/browser_jni_registrar.h"
 #include "mojo/android/system/mojo_jni_registrar.h"
@@ skipping 183 matching lines @@
   // Enable all the |feature|, associating them with |trial_name|.
   command_line->AppendSwitchASCII(
       switches::kEnableFeatures,
       std::string(feature.name) + "<" + kFakeTrialName);
 
   std::map<std::string, std::string> param_values = {{param_name, param_value}};
   variations::testing::VariationParamsManager::AppendVariationParams(
       kFakeTrialName, kFakeTrialGroupName, param_values, command_line);
 }
 
+void EnableTopDocumentIsolationForTesting(base::CommandLine* command_line) {
+  EnableFeatureWithParam(
+      features::kTopDocumentIsolation, features::kTopDocumentIsolationModeParam,
+      std::to_string(
+          static_cast<int>(features::TopDocumentIsolationMode::CrossSite)),
+      command_line);

[Łukasz Anforowicz, 2017/07/17 17:34:37]

This is now rebased on top of r486814.

+}
+
 #if defined(OS_ANDROID)
 // Registers content/browser and mojo JNI bindings necessary for some types of
 // tests.
 bool RegisterJniForTesting(JNIEnv* env) {
   return mojo::android::RegisterSystemJni(env) &&
          content::android::RegisterBrowserJni(env);
 }
 #endif
 
 MessageLoopRunner::MessageLoopRunner(QuitMode quit_mode)
@@ skipping 176 matching lines @@
 
 void WebContentsDestroyedWatcher::Wait() {
   run_loop_.Run();
 }
 
 void WebContentsDestroyedWatcher::WebContentsDestroyed() {
   run_loop_.Quit();
 }
 
 }  // namespace content