1 files changed, 0 insertions, 32 deletions
diff --git a/chromium/chrome/browser/net/trust_token_usecounter_browsertest.cc b/chromium/chrome/browser/net/trust_token_usecounter_browsertest.cc
index b0796132fff..c17c637f9d4 100644
--- a/chromium/chrome/browser/net/trust_token_usecounter_browsertest.cc
+++ b/chromium/chrome/browser/net/trust_token_usecounter_browsertest.cc
@@ -7,7 +7,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "content/public/browser/back_forward_cache.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
@@ -50,17 +49,6 @@ IN_PROC_BROWSER_TEST_F(TrustTokenUseCountersBrowsertest, CountsFetchUse) {
   GURL start_url(server_.GetURL("/title1.html"));
   EXPECT_TRUE(ui_test_utils::NavigateToURL(browser(), start_url));
 
-  // Ensure that the previous page won't be stored in the back/forward cache, so
-  // that the histogram will be recorded when the previous page is unloaded.
-  // TODO(https://crbug.com/1229122): Investigate if this needs further fix.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetController()
-      .GetBackForwardCache()
-      .DisableForTesting(
-          content::BackForwardCache::TEST_ASSUMES_NO_RENDER_FRAME_CHANGE);
-
   std::string cmd = R"(
   (async () => {
     await fetch("/page404.html", {trustToken: {type: 'token-request'}});
@@ -86,16 +74,6 @@ IN_PROC_BROWSER_TEST_F(TrustTokenUseCountersBrowsertest, CountsXhrUse) {
   GURL start_url(server_.GetURL("/title1.html"));
   EXPECT_TRUE(ui_test_utils::NavigateToURL(browser(), start_url));
 
-  // Ensure that the previous page won't be stored in the back/forward cache, so
-  // that the histogram will be recorded when the previous page is unloaded.
-  // TODO(https://crbug.com/1229122): Investigate if this needs further fix.
-  browser()
-      ->tab_strip_model()
-      ->GetActiveWebContents()
-      ->GetController()
-      .GetBackForwardCache()
-      .DisableForTesting(content::BackForwardCache::TEST_ASSUMES_NO_CACHING);
-
   base::HistogramTester histograms;
 
   // Execute a Trust Tokens issuance against a nonexistent endpoint.
@@ -137,11 +115,6 @@ IN_PROC_BROWSER_TEST_F(TrustTokenUseCountersBrowsertest, CountsIframeUse) {
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  // Ensure that the previous page won't be stored in the back/forward cache, so
-  // that the histogram will be recorded when the previous page is unloaded.
-  // TODO(https://crbug.com/1229122): Investigate if this needs further fix.
-  web_contents->GetController().GetBackForwardCache().DisableForTesting(
-      content::BackForwardCache::TEST_ASSUMES_NO_CACHING);
 
   // It's important to set the trust token arguments before updating src, as
   // the latter triggers a load. It's also important to JsReplace the trustToken
@@ -172,11 +145,6 @@ IN_PROC_BROWSER_TEST_F(TrustTokenUseCountersBrowsertest, CountsIframeUseViaSetat
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  // Ensure that the previous page won't be stored in the back/forward cache, so
-  // that the histogram will be recorded when the previous page is unloaded.
-  // TODO(https://crbug.com/1229122): Investigate if this needs further fix.
-  web_contents->GetController().GetBackForwardCache().DisableForTesting(
-      content::BackForwardCache::TEST_ASSUMES_NO_CACHING);
 
   // It's important to set the trust token arguments before updating src, as
   // the latter triggers a load. It's also important to JsReplace the trustToken