Improve memory estimate of SpdySessionPool in net/ MemoryDumpProvider.

net/spdy/spdy_session.cc

Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index a7287cdecf96f9740a1e0e9f89c7f8de61049758..bec1c5789265691784954d75634af823a3aeb91c 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -25,6 +25,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
+#include "base/trace_event/memory_usage_estimator.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "crypto/ec_private_key.h"
@@ -559,6 +560,10 @@ base::WeakPtr<SpdyStream> SpdyStreamRequest::ReleaseStream() {
   return stream;
 }
 
+size_t SpdyStreamRequest::EstimateMemoryUsage() const {
+  return base::trace_event::EstimateItemMemoryUsage(url_);
+}
+
 void SpdyStreamRequest::OnRequestCompleteSuccess(
     const base::WeakPtr<SpdyStream>& stream) {
   DCHECK(session_);
@@ -1059,10 +1064,28 @@ bool SpdySession::CloseOneIdleConnection() {
   return false;
 }
 
-void SpdySession::DumpMemoryStats(StreamSocket::SocketMemoryStats* stats,
-                                  bool* is_session_active) const {
+size_t SpdySession::DumpMemoryStats(StreamSocket::SocketMemoryStats* stats,
+                                    bool* is_session_active) const {
   *is_session_active = is_active();
   connection_->DumpMemoryStats(stats);
+  size_t memory_estimate =
+      stats->total_size + kReadBufferSize +
+      base::trace_event::EstimateMemoryUsage(spdy_session_key_) +

[DmitrySkiba, 2017/02/02 18:16:27]

connection_, unclaimed_pushed_streams_, priority_dependency_state_ should also
be estimated.

Please leave TODO about estimating read_buffer_ (scoped_refptr).

[xunjieli, 2017/02/03 22:25:09]

Done. I estimated |read_buffer_| including kReadBufferSize. |connection_| is
estimated in |stats->total_size|.

+      base::trace_event::EstimateMemoryUsage(pooled_aliases_) +
+      base::trace_event::EstimateMemoryUsage(active_streams_) +
+      base::trace_event::EstimateMemoryUsage(created_streams_) +
+      base::trace_event::EstimateMemoryUsage(write_queue_) +
+      base::trace_event::EstimateMemoryUsage(initial_settings_);
+  if (in_flight_write_)
+    memory_estimate += base::trace_event::EstimateMemoryUsage(in_flight_write_);

[DmitrySkiba, 2017/02/02 18:16:27]

You don't need this if, EMU(unique_ptr) returns 0 if the pointer holds null.

[xunjieli, 2017/02/03 22:25:09]

Done.

+  if (buffered_spdy_framer_) {
+    memory_estimate +=
+        base::trace_event::EstimateMemoryUsage(buffered_spdy_framer_);
+  }
+  // TODO(xunjieli): https://crbug.com/669108. Track
+  // |pending_create_stream_queue_|, |stream_send_unstall_queue_| after
+  // std::deque is supported in memory_usage_estimator.h.
+  return memory_estimate;
 }
 
 void SpdySession::EnqueueStreamWrite(