Cleanup CookiePolicyBrowserTest
We don't need to enable the kImprovedCookieControls flag anymore to
make these tests pass.
Bug: 967668
Change-Id: Ic0858e9b48756fbd644a0d506c674df87e1e1dfa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1859779
Commit-Queue: Christian Dullweber <[email protected]>
Auto-Submit: Christian Dullweber <[email protected]>
Reviewed-by: Maksim Orlovich <[email protected]>
Cr-Commit-Position: refs/heads/master@{#705866}
diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc
index a647134..3729415 100644
--- a/chrome/browser/net/cookie_policy_browsertest.cc
+++ b/chrome/browser/net/cookie_policy_browsertest.cc
@@ -143,20 +143,6 @@
DISALLOW_COPY_AND_ASSIGN(CookiePolicyBrowserTest);
};
-// CookiePolicyBrowserTest with a feature list that enables usage of
-// TopLevelOrigin for CookieSettings. This is only required until this
-// behavior can be enabled by default. https://crbug.com/988398
-class CookiePolicyTopLevelOriginBrowserTest : public CookiePolicyBrowserTest {
- public:
- CookiePolicyTopLevelOriginBrowserTest() {
- enable_cookie_controls_.InitAndEnableFeature(
- content_settings::kImprovedCookieControls);
- }
-
- private:
- base::test::ScopedFeatureList enable_cookie_controls_;
-};
-
// Visits a page that sets a first-party cookie.
IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest, AllowFirstPartyCookies) {
SetBlockThirdPartyCookies(false);
@@ -317,7 +303,7 @@
ExpectNestedFrameContent("None");
}
-IN_PROC_BROWSER_TEST_F(CookiePolicyTopLevelOriginBrowserTest,
+IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest,
ThirdPartyCookiesIFrameExceptions) {
SetBlockThirdPartyCookies(true);
@@ -354,7 +340,7 @@
ExpectNestedFrameContent("thirdparty");
}
-IN_PROC_BROWSER_TEST_F(CookiePolicyTopLevelOriginBrowserTest,
+IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest,
ThirdPartyCookiesIFrameThirdPartyExceptions) {
SetBlockThirdPartyCookies(true);
@@ -392,8 +378,7 @@
ExpectNestedFrameContent("thirdparty");
}
-IN_PROC_BROWSER_TEST_F(CookiePolicyTopLevelOriginBrowserTest,
- ThirdPartyIFrameStorage) {
+IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest, ThirdPartyIFrameStorage) {
NavigateToPageWithFrame("a.com");
NavigateFrameTo("b.com", "/browsing_data/site_data.html");
ExpectStorageForFrame(GetFrame(), false);
@@ -434,8 +419,7 @@
ExpectStorageForFrame(GetFrame(), true);
}
-IN_PROC_BROWSER_TEST_F(CookiePolicyTopLevelOriginBrowserTest,
- NestedThirdPartyIFrameStorage) {
+IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest, NestedThirdPartyIFrameStorage) {
NavigateToPageWithFrame("a.com");
NavigateFrameTo("b.com", "/iframe.html");
NavigateNestedFrameTo("c.com", "/browsing_data/site_data.html");
@@ -482,8 +466,7 @@
ExpectStorageForFrame(GetNestedFrame(), true);
}
-IN_PROC_BROWSER_TEST_F(CookiePolicyTopLevelOriginBrowserTest,
- NestedFirstPartyIFrameStorage) {
+IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest, NestedFirstPartyIFrameStorage) {
NavigateToPageWithFrame("a.com");
NavigateFrameTo("b.com", "/iframe.html");
NavigateNestedFrameTo("a.com", "/browsing_data/site_data.html");
