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

Side by Side Diff: net/socket/ssl_client_socket_impl.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/ssl_client_socket_impl.h" 5 #include "net/socket/ssl_client_socket_impl.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <openssl/bio.h> 8 #include <openssl/bio.h>
9 #include <openssl/bytestring.h> 9 #include <openssl/bytestring.h>
10 #include <openssl/err.h> 10 #include <openssl/err.h>
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 } 719 }
720 720
721 int SSLClientSocketImpl::GetPeerAddress(IPEndPoint* addressList) const { 721 int SSLClientSocketImpl::GetPeerAddress(IPEndPoint* addressList) const {
722 return transport_->socket()->GetPeerAddress(addressList); 722 return transport_->socket()->GetPeerAddress(addressList);
723 } 723 }
724 724
725 int SSLClientSocketImpl::GetLocalAddress(IPEndPoint* addressList) const { 725 int SSLClientSocketImpl::GetLocalAddress(IPEndPoint* addressList) const {
726 return transport_->socket()->GetLocalAddress(addressList); 726 return transport_->socket()->GetLocalAddress(addressList);
727 } 727 }
728 728
729 const BoundNetLog& SSLClientSocketImpl::NetLog() const { 729 const NetLogWithSource& SSLClientSocketImpl::NetLog() const {
730 return net_log_; 730 return net_log_;
731 } 731 }
732 732
733 void SSLClientSocketImpl::SetSubresourceSpeculation() { 733 void SSLClientSocketImpl::SetSubresourceSpeculation() {
734 if (transport_.get() && transport_->socket()) { 734 if (transport_.get() && transport_->socket()) {
735 transport_->socket()->SetSubresourceSpeculation(); 735 transport_->socket()->SetSubresourceSpeculation();
736 } else { 736 } else {
737 NOTREACHED(); 737 NOTREACHED();
738 } 738 }
739 } 739 }
(...skipping 1540 matching lines...) Expand 10 before | Expand all | Expand 10 after
2280 } 2280 }
2281 UMA_HISTOGRAM_ENUMERATION("DomainBoundCerts.Support", supported, 2281 UMA_HISTOGRAM_ENUMERATION("DomainBoundCerts.Support", supported,
2282 CHANNEL_ID_USAGE_MAX); 2282 CHANNEL_ID_USAGE_MAX);
2283 } 2283 }
2284 2284
2285 bool SSLClientSocketImpl::IsChannelIDEnabled() const { 2285 bool SSLClientSocketImpl::IsChannelIDEnabled() const {
2286 return ssl_config_.channel_id_enabled && channel_id_service_; 2286 return ssl_config_.channel_id_enabled && channel_id_service_;
2287 } 2287 }
2288 2288
2289 } // namespace net 2289 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698