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

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

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 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 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
7 7
8 #include <openssl/base.h> 8 #include <openssl/base.h>
9 #include <openssl/ssl.h> 9 #include <openssl/ssl.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 unsigned char* out, 88 unsigned char* out,
89 unsigned int outlen) override; 89 unsigned int outlen) override;
90 90
91 // StreamSocket implementation. 91 // StreamSocket implementation.
92 int Connect(const CompletionCallback& callback) override; 92 int Connect(const CompletionCallback& callback) override;
93 void Disconnect() override; 93 void Disconnect() override;
94 bool IsConnected() const override; 94 bool IsConnected() const override;
95 bool IsConnectedAndIdle() const override; 95 bool IsConnectedAndIdle() const override;
96 int GetPeerAddress(IPEndPoint* address) const override; 96 int GetPeerAddress(IPEndPoint* address) const override;
97 int GetLocalAddress(IPEndPoint* address) const override; 97 int GetLocalAddress(IPEndPoint* address) const override;
98 const BoundNetLog& NetLog() const override; 98 const NetLogWithSource& NetLog() const override;
99 void SetSubresourceSpeculation() override; 99 void SetSubresourceSpeculation() override;
100 void SetOmniboxSpeculation() override; 100 void SetOmniboxSpeculation() override;
101 bool WasEverUsed() const override; 101 bool WasEverUsed() const override;
102 bool WasNpnNegotiated() const override; 102 bool WasNpnNegotiated() const override;
103 NextProto GetNegotiatedProtocol() const override; 103 NextProto GetNegotiatedProtocol() const override;
104 bool GetSSLInfo(SSLInfo* ssl_info) override; 104 bool GetSSLInfo(SSLInfo* ssl_info) override;
105 void GetConnectionAttempts(ConnectionAttempts* out) const override; 105 void GetConnectionAttempts(ConnectionAttempts* out) const override;
106 void ClearConnectionAttempts() override {} 106 void ClearConnectionAttempts() override {}
107 void AddConnectionAttempts(const ConnectionAttempts& attempts) override {} 107 void AddConnectionAttempts(const ConnectionAttempts& attempts) override {}
108 int64_t GetTotalReceivedBytes() const override; 108 int64_t GetTotalReceivedBytes() const override;
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 CTPolicyEnforcer* const policy_enforcer_; 371 CTPolicyEnforcer* const policy_enforcer_;
372 372
373 // pinning_failure_log contains a message produced by 373 // pinning_failure_log contains a message produced by
374 // TransportSecurityState::CheckPublicKeyPins in the event of a 374 // TransportSecurityState::CheckPublicKeyPins in the event of a
375 // pinning failure. It is a (somewhat) human-readable string. 375 // pinning failure. It is a (somewhat) human-readable string.
376 std::string pinning_failure_log_; 376 std::string pinning_failure_log_;
377 377
378 // True if PKP is bypassed due to a local trust anchor. 378 // True if PKP is bypassed due to a local trust anchor.
379 bool pkp_bypassed_; 379 bool pkp_bypassed_;
380 380
381 BoundNetLog net_log_; 381 NetLogWithSource net_log_;
382 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_; 382 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_;
383 }; 383 };
384 384
385 } // namespace net 385 } // namespace net
386 386
387 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 387 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698