Enable flaky browser test for BFCache with CCNS

Previously some disabled flaky tests are re-enabled form
crrev.com/c/3960091 since crbug.com/1229182 was fixed. There seems no
flake that cause the tests to be disabled again so we should be ready
to turn on the remaining test and observe the result.

Bug: 1336055, 1353858, 1281665
Change-Id: I0a35968625735a10bf54e4e13b0436e467fb5ac4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4380781
Reviewed-by: Rakina Zata Amni <rakina@chromium.org>
Commit-Queue: Mingyu Lei <leimy@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1124030}

content/browser/back_forward_cache_no_store_browsertest.cc

@@ -112,7 +112,6 @@ class BackForwardCacheBrowserTestAllowCacheControlNoStore
 
 // Test that a page with cache-control:no-store enters bfcache with the flag on,
 // but does not get restored and gets evicted.
-// Turned off on cast for https://crbug.com/1281665 , along with others.
 IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestAllowCacheControlNoStore,
                        PagesWithCacheControlNoStoreEnterBfcacheAndEvicted) {
   net::test_server::ControllableHttpResponse response(embedded_test_server(),
@@ -151,17 +150,9 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestAllowCacheControlNoStore,
 // Test that a page with cache-control:no-store enters bfcache with the flag on,
 // and if a cookie is modified while it is in bfcache via JavaScript, gets
 // evicted with cookie modified marked.
-// Turned off on cast for https://crbug.com/1281665 .
-#if BUILDFLAG(IS_CASTOS)
-#define MAYBE_PagesWithCacheControlNoStoreCookieModifiedThroughJavaScript \
-        DISABLED_PagesWithCacheControlNoStoreCookieModifiedThroughJavaScript
-#else
-#define MAYBE_PagesWithCacheControlNoStoreCookieModifiedThroughJavaScript \
-        PagesWithCacheControlNoStoreCookieModifiedThroughJavaScript
-#endif  // BUILDFLAG(IS_CASTOS)
 IN_PROC_BROWSER_TEST_F(
     BackForwardCacheBrowserTestAllowCacheControlNoStore,
-    MAYBE_PagesWithCacheControlNoStoreCookieModifiedThroughJavaScript) {
+    PagesWithCacheControlNoStoreCookieModifiedThroughJavaScript) {
   net::test_server::ControllableHttpResponse response(embedded_test_server(),
                                                       "/title1.html");
   ASSERT_TRUE(embedded_test_server()->Start());
@@ -280,21 +271,9 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestAllowCacheControlNoStore,
 // Test that a page with cache-control:no-store enters bfcache with the flag on,
 // and even if a cookie is modified on a different domain than the entry, the
 // entry is not marked as cookie modified.
-// Turned off on cast for https://crbug.com/1281665 .
-//
-// TODO(crbug.com/1336055): It may be possible to re-enable this test now that
-// crbug.com/1229182 has been resolved. This was originally disabled due to
-// flakiness on Cast Audio Linux.
-#if BUILDFLAG(IS_CASTOS)
-#define MAYBE_PagesWithCacheControlNoStoreCookieModifiedThroughJavaScriptOnDifferentDomain \
-        DISABLED_PagesWithCacheControlNoStoreCookieModifiedThroughJavaScriptOnDifferentDomain
-#else
-#define MAYBE_PagesWithCacheControlNoStoreCookieModifiedThroughJavaScriptOnDifferentDomain \
-        PagesWithCacheControlNoStoreCookieModifiedThroughJavaScriptOnDifferentDomain
-#endif  // BUILDFLAG(IS_CASTOS)
 IN_PROC_BROWSER_TEST_F(
     BackForwardCacheBrowserTestAllowCacheControlNoStore,
-    MAYBE_PagesWithCacheControlNoStoreCookieModifiedThroughJavaScriptOnDifferentDomain) {
+    PagesWithCacheControlNoStoreCookieModifiedThroughJavaScriptOnDifferentDomain) {
   net::test_server::ControllableHttpResponse response(embedded_test_server(),
                                                       "/title1.html");
   ASSERT_TRUE(embedded_test_server()->Start());
@@ -483,26 +462,11 @@ const char kResponseWithNoCacheWithRedirectionWithHTTPOnlyCookie[] =
     "\r\n";
 }  // namespace
 
-// TODO(crbug.com/1336055): It may be possible to re-enable this test now that
-// crbug.com/1229182 has been resolved. This was originally disabled due to
-// flakiness on Cast Audio Linux.
-#if BUILDFLAG(IS_CASTOS)
-#define MAYBE_PagesWithCacheControlNoStoreSetFromResponseHeader \
-  DISABLED_PagesWithCacheControlNoStoreSetFromResponseHeader
-#elif BUILDFLAG(IS_LINUX)
-// Flaky: https://crbug.com/1353858
-#define MAYBE_PagesWithCacheControlNoStoreSetFromResponseHeader \
-  DISABLED_PagesWithCacheControlNoStoreSetFromResponseHeader
-#else
-#define MAYBE_PagesWithCacheControlNoStoreSetFromResponseHeader \
-  PagesWithCacheControlNoStoreSetFromResponseHeader
-#endif
 // Test that a page with cache-control:no-store enters bfcache with the flag on,
 // and if a cookie is modified while it is in bfcache via response header, gets
 // evicted with cookie modified marked.
-IN_PROC_BROWSER_TEST_F(
-    BackForwardCacheBrowserTestAllowCacheControlNoStore,
-    MAYBE_PagesWithCacheControlNoStoreSetFromResponseHeader) {
+IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTestAllowCacheControlNoStore,
+                       PagesWithCacheControlNoStoreSetFromResponseHeader) {
   net::test_server::ControllableHttpResponse response(embedded_test_server(),
                                                       "/title1.html");
   ASSERT_TRUE(embedded_test_server()->Start());
@@ -548,22 +512,12 @@ IN_PROC_BROWSER_TEST_F(
                   BlockListedFeatures()));
 }
 
-// TODO(crbug.com/1336055): It may be possible to re-enable this test now that
-// crbug.com/1229182 has been resolved. This was originally disabled due to
-// flakiness on Cast Audio Linux.
-#if BUILDFLAG(IS_CASTOS)
-#define MAYBE_PagesWithCacheControlNoStoreSetFromResponseHeaderHTTPOnlyCookie \
-  DISABLED_PagesWithCacheControlNoStoreSetFromResponseHeaderHTTPOnlyCookie
-#else
-#define MAYBE_PagesWithCacheControlNoStoreSetFromResponseHeaderHTTPOnlyCookie \
-  PagesWithCacheControlNoStoreSetFromResponseHeaderHTTPOnlyCookie
-#endif  // BUILDFLAG(IS_CASTOS)
 // Test that a page with cache-control:no-store enters bfcache with the flag on,
 // and if HTTPOnly cookie is modified while it is in bfcache, gets evicted with
 // HTTPOnly cookie modified marked.
 IN_PROC_BROWSER_TEST_F(
     BackForwardCacheBrowserTestAllowCacheControlNoStore,
-    MAYBE_PagesWithCacheControlNoStoreSetFromResponseHeaderHTTPOnlyCookie) {
+    PagesWithCacheControlNoStoreSetFromResponseHeaderHTTPOnlyCookie) {
   // HTTPOnly cookie can be only set over HTTPS.
   CreateHttpsServer();
   net::test_server::ControllableHttpResponse response(https_server(),