Remove support for ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT.
Those requests will instead fail with the more generic ERR_TUNNEL_CONNECTION_FAILED.
Bug: 928551
TBR: [email protected],[email protected],[email protected]
Change-Id: I3a41c2b52a30fbe75bcf8c6490c5c7162f80f68a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1577685
Commit-Queue: Eric Roman <[email protected]>
Reviewed-by: Brian White <[email protected]>
Reviewed-by: Matt Menke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#653264}diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index a966ab5..d21c871 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -9591,7 +9591,7 @@
data.Resume();
rv = callback.WaitForResult();
- EXPECT_THAT(rv, IsError(ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT));
+ EXPECT_THAT(rv, IsError(ERR_TUNNEL_CONNECTION_FAILED));
}
// Test that an HTTPS Proxy cannot redirect a CONNECT request for subresources.
@@ -9638,11 +9638,7 @@
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
- EXPECT_THAT(rv, IsError(ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT));
-
- histograms.ExpectUniqueSample(
- "Net.Proxy.RedirectDuringConnect",
- HttpNetworkTransaction::kSubresourceByExplicitProxy, 1);
+ EXPECT_THAT(rv, IsError(ERR_TUNNEL_CONNECTION_FAILED));
}
// Test that an HTTPS Proxy which was auto-detected cannot redirect a CONNECT
@@ -9691,11 +9687,7 @@
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
- EXPECT_THAT(rv, IsError(ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT));
-
- histograms.ExpectUniqueSample(
- "Net.Proxy.RedirectDuringConnect",
- HttpNetworkTransaction::kMainFrameByAutoDetectedProxy, 1);
+ EXPECT_THAT(rv, IsError(ERR_TUNNEL_CONNECTION_FAILED));
}
// Tests that an HTTPS (SPDY) Proxy's cannot redirect a CONNECT request for main
@@ -9768,11 +9760,7 @@
FastForwardBy(kTimeIncrement);
data.Resume();
rv = callback.WaitForResult();
- EXPECT_THAT(rv, IsError(ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT));
-
- histograms.ExpectUniqueSample(
- "Net.Proxy.RedirectDuringConnect",
- HttpNetworkTransaction::kMainFrameByExplicitProxy, 1);
+ EXPECT_THAT(rv, IsError(ERR_TUNNEL_CONNECTION_FAILED));
}
// Test that an HTTPS proxy's response to a CONNECT request is filtered.
