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

content/browser/top_document_isolation_browsertest.cc

 // Copyright 2016 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 <string>
 
 #include "base/command_line.h"
+#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_features.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_frame_navigation_observer.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/content_browser_test_utils_internal.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class TopDocumentIsolationTest : public ContentBrowserTest {
  public:
   TopDocumentIsolationTest() {}
 
  protected:
   std::string DepictFrameTree(FrameTreeNode* node) {
     return visualizer_.DepictFrameTree(node);
   }
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    ContentBrowserTest::SetUpCommandLine(command_line);
-    content::EnableTopDocumentIsolationForTesting(command_line);
+  void SetUp() override {
+    scoped_feature_list_.InitAndEnableFeature(features::kTopDocumentIsolation);
+    ContentBrowserTest::SetUp();
   }
 
   void SetUpOnMainThread() override {
     host_resolver()->AddRule("*", "127.0.0.1");
     SetupCrossSiteRedirector(embedded_test_server());
     ASSERT_TRUE(embedded_test_server()->Start());
   }
 
   FrameTreeNode* root() {
     return static_cast<WebContentsImpl*>(shell()->web_contents())
@@ skipping 15 matching lines @@
 
   void RendererInitiatedNavigateToURL(FrameTreeNode* node, const GURL& url) {
     TestFrameNavigationObserver nav_observer(node);
     ASSERT_TRUE(
         ExecuteScript(node, "window.location.href='" + url.spec() + "'"));
     nav_observer.Wait();
   }
 
  private:
   FrameTreeVisualizer visualizer_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TopDocumentIsolationTest);
 };
 
 IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, SameSiteDeeplyNested) {
   if (content::AreAllSitesIsolatedForTesting())
     return;  // Top Document Isolation is disabled in this mode.
 
   GURL main_url(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(a,a(a,a(a)))"));
@@ skipping 551 matching lines @@
       "      C = http://adnetwork.com/",
       DepictFrameTree(root()));
   EXPECT_EQ(
       " Site C ------------ proxies for B\n"
       "Where B = default subframe process\n"
       "      C = http://adnetwork.com/",
       DepictFrameTree(popup_root));
 }
 
 }  // namespace content