| commit | 9bfe0b6bb37d2218b56a0c7e9773ff9e70e053a9 | [log] [tgz] |
|---|---|---|
| author | Xida Chen <[email protected]> | Tue Apr 24 19:52:21 2018 |
| committer | Commit Bot <[email protected]> | Tue Apr 24 19:52:21 2018 |
| tree | 45bcbdd7059d0b5e08618a8d131a7860cafef395 | |
| parent | f860bdc8323f4701ca0930bf94cd9bfbb8d09b05 [diff] [blame] |
Reland "Reland "Remove HttpStreamFactory interface."" This reverts commit 7f7c86d81c9f49bcd09a5428f0ea387d03c6d33a. Reason for revert: <INSERT REASONING HERE> Causing compile error: https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Fuchsia%20ARM64%20Cast%20Audio/10534 Original change's description: > Revert "Reland "Remove HttpStreamFactory interface."" > > This reverts commit ea3e3f22b07a492c2211a035af9081fe6ec170c9. > > Reason for revert: Failure at > https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mac10.10%20Tests/31554 > > Original change's description: > > Reland "Remove HttpStreamFactory interface." > > > > Reland https://crrev.com/c/1000487. > > > > Remove HttpStreamFactory interface, also rename HttpStreamFactoryImpl > > to > > HttpStreamFactory. > > > > Bug: 829429 > > Change-Id: I298879817785174d1d7290520f889f0252074e14 > > Reviewed-on: https://chromium-review.googlesource.com/1023321 > > Commit-Queue: Bence Béky <[email protected]> > > Reviewed-by: Ryan Hamilton <[email protected]> > > Cr-Commit-Position: refs/heads/master@{#553180} > > [email protected],[email protected] > > Change-Id: I9fab232c4219d9e11d5df54f57c13dfd50540b2f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: 829429 > Reviewed-on: https://chromium-review.googlesource.com/1026491 > Commit-Queue: Bence Béky <[email protected]> > Reviewed-by: Bence Béky <[email protected]> > Cr-Commit-Position: refs/heads/master@{#553233} [email protected],[email protected] Change-Id: I1a33380942c2fc0d3aed903a4a505f0615e24f8c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 829429 Reviewed-on: https://chromium-review.googlesource.com/1026492 Reviewed-by: Xida Chen <[email protected]> Commit-Queue: Xida Chen <[email protected]> Cr-Commit-Position: refs/heads/master@{#553240}
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 50e2a8a..fef5023 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc
@@ -11955,8 +11955,8 @@ } // Ensure that we are not allowed to redirect traffic via an alternate protocol -// to an unsafe port, and that we resume the second HttpStreamFactoryImpl::Job -// once the alternate protocol request fails. +// to an unsafe port, and that we resume the second HttpStreamFactory::Job once +// the alternate protocol request fails. TEST_F(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) { HttpRequestInfo request; request.method = "GET";