Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(836)

Unified Diff: jingle/glue/proxy_resolving_client_socket.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: jingle/glue/proxy_resolving_client_socket.cc
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index de1c40f4513dabe922c486818dcf0387207a39f9..d77588e8328c97694fe05756562055def6cc083a 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -44,7 +44,7 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
// current use cases do.
proxy_url_("https://" + dest_host_port_pair_.ToString()),
tried_direct_connect_fallback_(false),
- bound_net_log_(net::BoundNetLog::Make(
+ net_log_(net::NetLogWithSource::Make(
request_context_getter->GetURLRequestContext()->net_log(),
net::NetLogSourceType::SOCKET)),
weak_factory_(this) {
@@ -147,7 +147,7 @@ int ProxyResolvingClientSocket::Connect(
proxy_resolve_callback_,
&pac_request_,
NULL,
- bound_net_log_);
+ net_log_);
if (status != net::ERR_IO_PENDING) {
// We defer execution of ProcessProxyResolveDone instead of calling it
// directly here for simplicity. From the caller's point of view,
@@ -204,7 +204,7 @@ void ProxyResolvingClientSocket::ProcessProxyResolveDone(int status) {
// Now that we have resolved the proxy, we need to connect.
status = net::InitSocketHandleForRawConnect(
dest_host_port_pair_, network_session_.get(), proxy_info_, ssl_config_,
- ssl_config_, net::PRIVACY_MODE_DISABLED, bound_net_log_, transport_.get(),
+ ssl_config_, net::PRIVACY_MODE_DISABLED, net_log_, transport_.get(),
connect_callback_);
if (status != net::ERR_IO_PENDING) {
// Since this method is always called asynchronously. it is OK to call
@@ -292,7 +292,7 @@ int ProxyResolvingClientSocket::ReconsiderProxyAfterError(int error) {
int rv = network_session_->proxy_service()->ReconsiderProxyAfterError(
proxy_url_, std::string(), error, &proxy_info_, proxy_resolve_callback_,
- &pac_request_, NULL, bound_net_log_);
+ &pac_request_, NULL, net_log_);
if (rv == net::OK || rv == net::ERR_IO_PENDING) {
CloseTransportSocket();
} else {
@@ -370,11 +370,11 @@ int ProxyResolvingClientSocket::GetLocalAddress(
return net::ERR_SOCKET_NOT_CONNECTED;
}
-const net::BoundNetLog& ProxyResolvingClientSocket::NetLog() const {
+const net::NetLogWithSource& ProxyResolvingClientSocket::NetLog() const {
if (transport_.get() && transport_->socket())
return transport_->socket()->NetLog();
NOTREACHED();
- return bound_net_log_;
+ return net_log_;
}
void ProxyResolvingClientSocket::SetSubresourceSpeculation() {

Powered by Google App Engine
This is Rietveld 408576698