Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Unified Diff: chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc

Issue 2987563004: Revert of Use FrameIsAd to decide whether to isolate a frame in TopDocumentIsolation mode. (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc
diff --git a/chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc b/chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc
index 1d064619c1066db6b4ef2a04e1afd82c32e07bb2..efdba248733b87de8a2b9549a095f64c9f1d7cbb 100644
--- a/chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc
+++ b/chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc
@@ -5,6 +5,7 @@
#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"
@@ -204,12 +205,8 @@
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());
@@ -222,6 +219,8 @@
}
private:
+ base::test::ScopedFeatureList scoped_feature_list_;
+
DISALLOW_COPY_AND_ASSIGN(SubframeTaskTDIBrowserTest);
};

Powered by Google App Engine
This is Rietveld 408576698