Improve memory estimate of SpdySessionPool in net/ MemoryDumpProvider.

net/spdy/spdy_header_block.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_header_block.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "net/base/arena.h"
 #include "net/http/http_log_util.h"
 #include "net/log/net_log_capture_mode.h"
+#include "net/spdy/platform/api/spdy_estimate_memory_usage.h"
 
 using base::StringPiece;
 using std::dec;
 using std::hex;
 using std::make_pair;
 using std::max;
 using std::min;
 using std::string;
 
 namespace net {
@@ skipping 54 matching lines @@
       total_size += fragment.size();
     }
     char* dst = arena_.Alloc(total_size);
     size_t written = Join(dst, fragments, separator);
     DCHECK_EQ(written, total_size);
     return StringPiece(dst, total_size);
   }
 
   size_t bytes_allocated() const { return arena_.status().bytes_allocated(); }
 
+  // TODO(xunjieli): https://crbug.com/669108. Merge this with bytes_allocated()
+  size_t EstimateMemoryUsage() const {
+    return arena_.status().bytes_allocated();
+  }
+
  private:
   UnsafeArena arena_;
 };
 
 SpdyHeaderBlock::HeaderValue::HeaderValue(Storage* storage,
                                           StringPiece key,
                                           StringPiece initial_value)
     : storage_(storage), fragments_({initial_value}), pair_({key, {}}) {}
 
 SpdyHeaderBlock::HeaderValue::HeaderValue(HeaderValue&& other)
@@ skipping 190 matching lines @@
   auto iter = block_.find(key);
   if (iter == block_.end()) {
     DVLOG(1) << "Inserting: (" << key << ", " << value << ")";
     AppendHeader(key, value);
     return;
   }
   DVLOG(1) << "Updating key: " << iter->first << "; appending value: " << value;
   iter->second.Append(GetStorage()->Write(value));
 }
 
+size_t SpdyHeaderBlock::EstimateMemoryUsage() const {
+  // TODO(xunjieli): https://crbug.com/669108. Also include |block_| when EMU()
+  // supports linked_hash_map.
+  return SpdyEstimateMemoryUsage(storage_);
+}
+
 void SpdyHeaderBlock::AppendHeader(const StringPiece key,
                                    const StringPiece value) {
   auto storage = GetStorage();
   auto backed_key = storage->Write(key);
   block_.emplace(make_pair(
       backed_key, HeaderValue(storage, backed_key, storage->Write(value))));
 }
 
 SpdyHeaderBlock::Storage* SpdyHeaderBlock::GetStorage() {
   if (!storage_) {
@@ skipping 65 matching lines @@
   for (++it; it != fragments.end(); ++it) {
     memcpy(dst, separator.data(), separator.size());
     dst += separator.size();
     memcpy(dst, it->data(), it->size());
     dst += it->size();
   }
   return dst - original_dst;
 }
 
 }  // namespace net