diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/net/ftp | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/net/ftp')
| -rw-r--r-- | chromium/net/ftp/ftp_directory_listing_parser_unittest.cc | 6 | ||||
| -rw-r--r-- | chromium/net/ftp/ftp_network_transaction.cc | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc b/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc index 4eaf1dd97e4..73d19bc6cac 100644 --- a/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc +++ b/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc @@ -42,8 +42,8 @@ TEST_P(FtpDirectoryListingParserTest, Parse) { SCOPED_TRACE(base::StringPrintf("Test case: %s", GetParam())); std::string test_listing; - EXPECT_TRUE(file_util::ReadFileToString(test_dir.AppendASCII(GetParam()), - &test_listing)); + EXPECT_TRUE(base::ReadFileToString(test_dir.AppendASCII(GetParam()), + &test_listing)); std::vector<FtpDirectoryListingEntry> entries; EXPECT_EQ(OK, ParseFtpDirectoryListing(test_listing, @@ -51,7 +51,7 @@ TEST_P(FtpDirectoryListingParserTest, Parse) { &entries)); std::string expected_listing; - ASSERT_TRUE(file_util::ReadFileToString( + ASSERT_TRUE(base::ReadFileToString( test_dir.AppendASCII(std::string(GetParam()) + ".expected"), &expected_listing)); diff --git a/chromium/net/ftp/ftp_network_transaction.cc b/chromium/net/ftp/ftp_network_transaction.cc index ccd6e2ef3b1..9d0cbe2c596 100644 --- a/chromium/net/ftp/ftp_network_transaction.cc +++ b/chromium/net/ftp/ftp_network_transaction.cc @@ -650,7 +650,9 @@ int FtpNetworkTransaction::DoCtrlResolveHost() { HostResolver::RequestInfo info(HostPortPair::FromURL(request_->url)); // No known referrer. return resolver_.Resolve( - info, &addresses_, + info, + DEFAULT_PRIORITY, + &addresses_, base::Bind(&FtpNetworkTransaction::OnIOComplete, base::Unretained(this)), net_log_); } @@ -663,8 +665,8 @@ int FtpNetworkTransaction::DoCtrlResolveHostComplete(int result) { int FtpNetworkTransaction::DoCtrlConnect() { next_state_ = STATE_CTRL_CONNECT_COMPLETE; - ctrl_socket_.reset(socket_factory_->CreateTransportClientSocket( - addresses_, net_log_.net_log(), net_log_.source())); + ctrl_socket_ = socket_factory_->CreateTransportClientSocket( + addresses_, net_log_.net_log(), net_log_.source()); net_log_.AddEvent( NetLog::TYPE_FTP_CONTROL_CONNECTION, ctrl_socket_->NetLog().source().ToEventParametersCallback()); @@ -1249,8 +1251,8 @@ int FtpNetworkTransaction::DoDataConnect() { return Stop(rv); data_address = AddressList::CreateFromIPAddress( ip_endpoint.address(), data_connection_port_); - data_socket_.reset(socket_factory_->CreateTransportClientSocket( - data_address, net_log_.net_log(), net_log_.source())); + data_socket_ = socket_factory_->CreateTransportClientSocket( + data_address, net_log_.net_log(), net_log_.source()); net_log_.AddEvent( NetLog::TYPE_FTP_DATA_CONNECTION, data_socket_->NetLog().source().ToEventParametersCallback()); |