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

Unified Diff: net/url_request/url_request_context.cc

Issue 2541093003: Instrument SSL sockets using MemoryDumpProvider (Closed)
Patch Set: Fix flaky test Created 4 years 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
« no previous file with comments | « net/ssl/ssl_client_session_cache_unittest.cc ('k') | net/url_request/url_request_context_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_context.cc
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 14d6f548f1c3d285b45b22951c536674628c9471..42bcc899f06335addb72b43c43b1e6d9286143d4 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -15,6 +15,7 @@
#include "net/cookies/cookie_store.h"
#include "net/dns/host_resolver.h"
#include "net/http/http_transaction_factory.h"
+#include "net/socket/ssl_client_socket_impl.h"
#include "net/url_request/http_user_agent_settings.h"
#include "net/url_request/url_request.h"
@@ -127,6 +128,13 @@ bool URLRequestContext::OnMemoryDump(
dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameObjectCount,
base::trace_event::MemoryAllocatorDump::kUnitsObjects,
url_requests_->size());
+ HttpTransactionFactory* transaction_factory = http_transaction_factory();
+ if (transaction_factory) {
+ HttpNetworkSession* network_session = transaction_factory->GetSession();
+ if (network_session)
+ network_session->DumpMemoryStats(pmd, dump->absolute_name());
+ }
+ SSLClientSocketImpl::DumpSSLClientSessionMemoryStats(pmd);
return true;
}
« no previous file with comments | « net/ssl/ssl_client_session_cache_unittest.cc ('k') | net/url_request/url_request_context_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698