| Index: net/http/http_proxy_client_socket_wrapper.cc
|
| diff --git a/net/http/http_proxy_client_socket_wrapper.cc b/net/http/http_proxy_client_socket_wrapper.cc
|
| index 6be76b5bb7b2205f693652646d886a9d054e8839..5f8c937ec6e4dbffc5d25bb81e1bb8ec7269650d 100644
|
| --- a/net/http/http_proxy_client_socket_wrapper.cc
|
| +++ b/net/http/http_proxy_client_socket_wrapper.cc
|
| @@ -15,6 +15,8 @@
|
| #include "net/base/proxy_delegate.h"
|
| #include "net/http/http_proxy_client_socket.h"
|
| #include "net/http/http_response_info.h"
|
| +#include "net/log/net_log_event_type.h"
|
| +#include "net/log/net_log_source_type.h"
|
| #include "net/socket/client_socket_handle.h"
|
| #include "net/spdy/spdy_proxy_client_socket.h"
|
| #include "net/spdy/spdy_session.h"
|
| @@ -67,9 +69,10 @@ HttpProxyClientSocketWrapper::HttpProxyClientSocketWrapper(
|
| http_auth_cache,
|
| http_auth_handler_factory)
|
| : nullptr),
|
| - net_log_(BoundNetLog::Make(net_log.net_log(),
|
| - NetLog::SOURCE_PROXY_CLIENT_SOCKET_WRAPPER)) {
|
| - net_log_.BeginEvent(NetLog::TYPE_SOCKET_ALIVE,
|
| + net_log_(
|
| + BoundNetLog::Make(net_log.net_log(),
|
| + NetLogSourceType::PROXY_CLIENT_SOCKET_WRAPPER)) {
|
| + net_log_.BeginEvent(NetLogEventType::SOCKET_ALIVE,
|
| net_log.source().ToEventParametersCallback());
|
| DCHECK(transport_params || ssl_params);
|
| DCHECK(!transport_params || !ssl_params);
|
| @@ -79,7 +82,7 @@ HttpProxyClientSocketWrapper::~HttpProxyClientSocketWrapper() {
|
| // Make sure no sockets are returned to the lower level socket pools.
|
| Disconnect();
|
|
|
| - net_log_.EndEvent(NetLog::TYPE_SOCKET_ALIVE);
|
| + net_log_.EndEvent(NetLogEventType::SOCKET_ALIVE);
|
| }
|
|
|
| LoadState HttpProxyClientSocketWrapper::GetConnectLoadState() const {
|
|
|