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

chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "chrome/browser/task_manager/mock_web_contents_task_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/content_features.h"
@@ skipping 179 matching lines @@
               unresponsive_task == subframe_task_2);
 }
 
 // A test for top document isolation and how subframes show up in the task
 // manager as SubframeTasks.
 class SubframeTaskTDIBrowserTest : public InProcessBrowserTest {
  public:
   SubframeTaskTDIBrowserTest() {}
   ~SubframeTaskTDIBrowserTest() override {}
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    content::EnableTopDocumentIsolationForTesting(command_line);
-  }
-
   void SetUpOnMainThread() override {
+    scoped_feature_list_.InitAndEnableFeature(features::kTopDocumentIsolation);
     host_resolver()->AddRule("*", "127.0.0.1");
     ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
     content::SetupCrossSiteRedirector(embedded_test_server());
     embedded_test_server()->StartAcceptingConnections();
   }
 
   void NavigateTo(const char* page_url) const {
     ui_test_utils::NavigateToURL(browser(),
                                  embedded_test_server()->GetURL(page_url));
   }
 
  private:
+  base::test::ScopedFeatureList scoped_feature_list_;
+
   DISALLOW_COPY_AND_ASSIGN(SubframeTaskTDIBrowserTest);
 };
 
 // Makes sure that subframe row gets updated with the new title when the main
 // frame's title changes.
 IN_PROC_BROWSER_TEST_F(SubframeTaskTDIBrowserTest,
                        SubframeRowGetsUpdatedParentPageTitle) {
   if (content::AreAllSitesIsolatedForTesting()) {
     // If full site isolation is turned on, it supersedes top document
     // isolation, so bail if it is.
@@ skipping 31 matching lines @@
                                       base::UTF8ToUTF16(new_title));
   EXPECT_TRUE(ExecuteScript(web_contents, script));
   base::string16 actual_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(new_title, base::UTF16ToUTF8(actual_title));
 
   EXPECT_EQ(PrefixExpectedTabTitle(new_title), main_task->title());
   EXPECT_EQ(PrefixExpectedTDIRowTitle(new_title), tdi_task->title());
 }
 
 }  // namespace task_manager