Commit 57b585dc authored by Darren Shen's avatar Darren Shen Committed by Commit Bot

Revert "BFCache: Add browser_tests for WebRTC / WebLocks"

This reverts commit 3022f4eb.

Reason for revert: BackForwardCacheBrowserTest.WebMidiNotCached seems to fail consistently after being introduced in this CL: https://ci.chromium.org/p/chrome/builders/ci/linux-chromeos-google-rel/9378

Original change's description:
> BFCache: Add browser_tests for WebRTC / WebLocks
> 
> Bug: 981740
> Change-Id: Icd020d557eee5e0aa680119ade6022015f88f615
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1905296
> Commit-Queue: Kouhei Ueno <kouhei@chromium.org>
> Reviewed-by: Alexander Timin <altimin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#716916}

TBR=kouhei@chromium.org,altimin@chromium.org,arthursonzogni@chromium.org,fergal@chromium.org

Change-Id: I9ea359bb4620fbe72a7806e6af5829a4e4606112
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 981740
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1928471Reviewed-by: default avatarDarren Shen <shend@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717457}
parent 71e8aaea
...@@ -3921,102 +3921,4 @@ IN_PROC_BROWSER_TEST_F(SensorBackForwardCacheBrowserTest, ...@@ -3921,102 +3921,4 @@ IN_PROC_BROWSER_TEST_F(SensorBackForwardCacheBrowserTest,
FROM_HERE); FROM_HERE);
} }
IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, WebMidiNotCached) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url_a(embedded_test_server()->GetURL("/title1.html"));
GURL url_b(embedded_test_server()->GetURL("b.com", "/title1.html"));
// 1) Navigate to A.
ASSERT_TRUE(NavigateToURL(shell(), url_a));
RenderFrameHostImpl* rfh_a = current_frame_host();
RenderFrameDeletedObserver delete_observer_rfh_a(rfh_a);
// - Wait until requestMIDIAccess() promise is resolved.
EXPECT_TRUE(ExecJs(rfh_a, "navigator.requestMIDIAccess()"));
// 2) Navigate to B.
ASSERT_TRUE(NavigateToURL(shell(), url_b));
// - Page A should not be in the cache.
EXPECT_TRUE(delete_observer_rfh_a.deleted());
// 3) Go back.
web_contents()->GetController().GoBack();
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
ExpectNotRestored(
{BackForwardCacheMetrics::NotRestoredReason::kBlocklistedFeatures},
FROM_HERE);
ExpectBlocklistedFeature(
blink::scheduler::WebSchedulerTrackedFeature::kRequestedMIDIPermission,
FROM_HERE);
}
IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest,
RTCPeerConnectionNotCached) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url_a(embedded_test_server()->GetURL("/title1.html"));
GURL url_b(embedded_test_server()->GetURL("b.com", "/title1.html"));
// 1) Navigate to A.
ASSERT_TRUE(NavigateToURL(shell(), url_a));
RenderFrameHostImpl* rfh_a = current_frame_host();
RenderFrameDeletedObserver delete_observer_rfh_a(rfh_a);
EXPECT_TRUE(ExecJs(rfh_a, "new RTCPeerConnection()"));
// 2) Navigate to B.
ASSERT_TRUE(NavigateToURL(shell(), url_b));
// - Page A should not be in the cache.
delete_observer_rfh_a.WaitUntilDeleted();
// 3) Go back.
web_contents()->GetController().GoBack();
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
ExpectNotRestored(
{BackForwardCacheMetrics::NotRestoredReason::kBlocklistedFeatures,
BackForwardCacheMetrics::NotRestoredReason::
kDisableForRenderFrameHostCalled},
FROM_HERE);
ExpectBlocklistedFeature(
blink::scheduler::WebSchedulerTrackedFeature::kWebRTC, FROM_HERE);
}
IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, WebLocksNotCached) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url_a(embedded_test_server()->GetURL("/title1.html"));
GURL url_b(embedded_test_server()->GetURL("b.com", "/title1.html"));
// 1) Navigate to A.
ASSERT_TRUE(NavigateToURL(shell(), url_a));
RenderFrameHostImpl* rfh_a = current_frame_host();
RenderFrameDeletedObserver delete_observer_rfh_a(rfh_a);
// Wait for the page to acquire a lock and ensure that it continues to do so.
EXPECT_TRUE(ExecJs(rfh_a, R"(
const never_resolved = new Promise(resolve => {});
new Promise(continue_test => {
navigator.locks.request('test', async () => {
continue_test();
await never_resolved;
});
})
)"));
// 2) Navigate to B.
ASSERT_TRUE(NavigateToURL(shell(), url_b));
// - Page A should not be in the cache.
delete_observer_rfh_a.WaitUntilDeleted();
// 3) Go back.
web_contents()->GetController().GoBack();
EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
ExpectNotRestored(
{BackForwardCacheMetrics::NotRestoredReason::kBlocklistedFeatures},
FROM_HERE);
ExpectBlocklistedFeature(
blink::scheduler::WebSchedulerTrackedFeature::kWebLocks, FROM_HERE);
}
} // namespace content } // namespace content
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment