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

Unified Diff: net/socket/ssl_client_socket_impl.h

Issue 2414883005: TEMP DO NOT LAND (Closed)
Patch Set: temp 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 side-by-side diff with in-line comments
Download patch
Index: net/socket/ssl_client_socket_impl.h
diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
index ff235ed4bdfa0bd771c6cf326f1bdbabba5dfaab..2b7f808e2c6bd42dc6a1a85192f01b53edb9be2f 100644
--- a/net/socket/ssl_client_socket_impl.h
+++ b/net/socket/ssl_client_socket_impl.h
@@ -32,9 +32,14 @@
#include "net/ssl/ssl_client_cert_type.h"
#include "net/ssl/ssl_config_service.h"
+#include "base/trace_event/memory_dump_provider.h"
+
namespace base {
class FilePath;
class SequencedTaskRunner;
+namespace trace_event {
+class MemoryAllocatorDump;
+}
}
namespace crypto {
@@ -97,6 +102,8 @@ class SSLClientSocketImpl : public SSLClientSocket {
void Disconnect() override;
bool IsConnected() const override;
bool IsConnectedAndIdle() const override;
+ void OnAddedToPool() override;
+ void OnRemovedFromPool() override;
int GetPeerAddress(IPEndPoint* address) const override;
int GetLocalAddress(IPEndPoint* address) const override;
const NetLogWithSource& NetLog() const override;
@@ -110,6 +117,8 @@ class SSLClientSocketImpl : public SSLClientSocket {
void ClearConnectionAttempts() override {}
void AddConnectionAttempts(const ConnectionAttempts& attempts) override {}
int64_t GetTotalReceivedBytes() const override;
+ void PopulateAllocatorDump(
+ base::trace_event::MemoryAllocatorDump* dump) const override;
// Socket implementation.
int Read(IOBuffer* buf,
@@ -391,6 +400,9 @@ class SSLClientSocketImpl : public SSLClientSocket {
bool pkp_bypassed_;
NetLogWithSource net_log_;
+
+ bool in_pool_;
+
base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_;
};

Powered by Google App Engine
This is Rietveld 408576698