summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorclamy <clamy@chromium.org>2016-03-25 11:05:13 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 18:06:35 +0000
commit0f1bd199c8da687f6f53dd7315d371f1a6030c29 (patch)
treee2c9b76191a8c29731b69876dfb1d9342e9d344d /content
parent122cbe10ff5cd6a40d38991a53f9bfa50df923cb (diff)
downloadchromium_src-0f1bd199c8da687f6f53dd7315d371f1a6030c29.zip
chromium_src-0f1bd199c8da687f6f53dd7315d371f1a6030c29.tar.gz
chromium_src-0f1bd199c8da687f6f53dd7315d371f1a6030c29.tar.bz2
PlzNavigate: disable a ResourceDispatcherHostTest about transfers
This CL disables ResourceDispatcherHostTest.CancelRequestsForContextTransferred when Plznavigate is enabled. This test is testing something specific to transfer navigations, which don't exist with PlzNavigate. BUG=439423 Review URL: https://codereview.chromium.org/1833873003 Cr-Commit-Position: refs/heads/master@{#383304}
Diffstat (limited to 'content')
-rw-r--r--content/browser/loader/resource_dispatcher_host_unittest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index 25c7783..3ccaffe 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -2603,6 +2603,10 @@ TEST_P(ResourceDispatcherHostTest, CancelRequestsForContextDetached) {
// Test the cancelling of requests that are being transferred to a new renderer
// due to a redirection.
TEST_P(ResourceDispatcherHostTest, CancelRequestsForContextTransferred) {
+ // PlzNavigate: there are no transferred requests in PlzNavigate.
+ if (IsBrowserSideNavigationEnabled())
+ return;
+
EXPECT_EQ(0, host_.pending_requests());
int request_id = 1;