diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/net/http/http_proxy_client_socket.cc | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/http/http_proxy_client_socket.cc')
-rw-r--r-- | chromium/net/http/http_proxy_client_socket.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/net/http/http_proxy_client_socket.cc b/chromium/net/http/http_proxy_client_socket.cc index 46ff67800a2..f9ebee2a584 100644 --- a/chromium/net/http/http_proxy_client_socket.cc +++ b/chromium/net/http/http_proxy_client_socket.cc @@ -16,6 +16,7 @@ #include "net/base/io_buffer.h" #include "net/base/proxy_delegate.h" #include "net/http/http_basic_stream.h" +#include "net/http/http_log_util.h" #include "net/http/http_network_session.h" #include "net/http/http_request_info.h" #include "net/http/http_response_headers.h" @@ -394,10 +395,9 @@ int HttpProxyClientSocket::DoSendRequest() { BuildTunnelRequest(endpoint_, extra_headers, user_agent, &request_line_, &request_headers_); - net_log_.AddEvent( - NetLogEventType::HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, - base::Bind(&HttpRequestHeaders::NetLogCallback, - base::Unretained(&request_headers_), &request_line_)); + NetLogRequestHeaders(net_log_, + NetLogEventType::HTTP_TRANSACTION_SEND_TUNNEL_HEADERS, + request_line_, &request_headers_); } parser_buf_ = base::MakeRefCounted<GrowableIOBuffer>(); @@ -429,9 +429,9 @@ int HttpProxyClientSocket::DoReadHeadersComplete(int result) { if (response_.headers->GetHttpVersion() < HttpVersion(1, 0)) return ERR_TUNNEL_CONNECTION_FAILED; - net_log_.AddEvent( - NetLogEventType::HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS, - base::Bind(&HttpResponseHeaders::NetLogCallback, response_.headers)); + NetLogResponseHeaders( + net_log_, NetLogEventType::HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS, + response_.headers.get()); if (proxy_delegate_) { int rv = proxy_delegate_->OnHttp1TunnelHeadersReceived(proxy_server_, |