From 31ccca0778db85c159634478b4ec7997f6704860 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 11 Mar 2020 11:32:04 +0100 Subject: BASELINE: Update Chromium to 80.0.3987.136 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b Reviewed-by: Jüri Valdmann --- chromium/net/ftp/ftp_directory_listing_parser_unittest.cc | 2 +- chromium/net/ftp/ftp_network_transaction.cc | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'chromium/net/ftp') diff --git a/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc b/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc index 487aa5f0493..de08f994785 100644 --- a/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc +++ b/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc @@ -176,7 +176,7 @@ const FtpTestParam kTestParams[] = { {"dir-listing-windows-2", OK}, }; -INSTANTIATE_TEST_SUITE_P(, +INSTANTIATE_TEST_SUITE_P(All, FtpDirectoryListingParserTest, testing::ValuesIn(kTestParams), TestName); diff --git a/chromium/net/ftp/ftp_network_transaction.cc b/chromium/net/ftp/ftp_network_transaction.cc index a24102f0b6c..b42305afe41 100644 --- a/chromium/net/ftp/ftp_network_transaction.cc +++ b/chromium/net/ftp/ftp_network_transaction.cc @@ -20,6 +20,7 @@ #include "net/base/escape.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" +#include "net/base/network_isolation_key.h" #include "net/base/parse_number.h" #include "net/base/port_util.h" #include "net/base/url_util.h" @@ -662,8 +663,11 @@ int FtpNetworkTransaction::DoLoop(int result) { int FtpNetworkTransaction::DoCtrlResolveHost() { next_state_ = STATE_CTRL_RESOLVE_HOST_COMPLETE; - resolve_request_ = resolver_->CreateRequest( - HostPortPair::FromURL(request_->url), net_log_, base::nullopt); + // Using an empty NetworkIsolationKey here, since FTP support is deprecated, + // and should go away soon. + resolve_request_ = + resolver_->CreateRequest(HostPortPair::FromURL(request_->url), + NetworkIsolationKey(), net_log_, base::nullopt); return resolve_request_->Start(base::BindOnce( &FtpNetworkTransaction::OnIOComplete, base::Unretained(this))); } -- cgit v1.2.1