Refactoring: Move functions from WebMemoryDumpProviderAdapter to PartitionAllocMemoryDumpProvider

content/child/web_process_memory_dump_impl.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_CHILD_WEB_PROCESS_MEMORY_DUMP_IMPL_H_
 #define CONTENT_CHILD_WEB_PROCESS_MEMORY_DUMP_IMPL_H_
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
@@ skipping 57 matching lines @@
       const blink::WebString& dump_name_prefix) override;
 
   const base::trace_event::ProcessMemoryDump* process_memory_dump() const {
     return process_memory_dump_;
   }
 
   blink::WebMemoryAllocatorDump* CreateDiscardableMemoryAllocatorDump(
       const std::string& name,
       base::DiscardableMemory* discardable);
 
+  base::trace_event::ProcessMemoryDump* getProcessMemoryDump() override;

[Primiano Tucci (use gerrit), 2016/02/01 13:50:00]

The only weird thing here is that with this CL you are now in a state where most
of the code that uses memory-infra use the wrapped WebProcessMemoryDump, but now
you are cutting a hole through the layers here to get directly to the
base::trace_event::PMD.

It seems that here you want just the SessionState, so why not just adding a
method like:

base::trace_event__MemoryDumpSessionState* getMemoryDumpSessionState()
here ?

[hajimehoshi, 2016/02/02 08:44:44]

Makes sense. Unfortunately, not only the session state but also calling DumpInto
are required here. I crated WebProcessMemoryDump::dumpPartitionAllocHeapUsage
instead of getProcessMemoryDump, and moved the logic using ProcessMemoryDump* to
the new function. I think we would need more refactoring since the new method is
used only for Parition Alloc.

+
  private:
   FRIEND_TEST_ALL_PREFIXES(WebProcessMemoryDumpImplTest, IntegrationTest);
 
   blink::WebMemoryAllocatorDump* createWebMemoryAllocatorDump(
       base::trace_event::MemoryAllocatorDump* memory_allocator_dump);
 
   // Only for the case of ProcessMemoryDump being owned (i.e. the default ctor).
   scoped_ptr<base::trace_event::ProcessMemoryDump> owned_process_memory_dump_;
 
   // The underlying ProcessMemoryDump instance to which the
@@ skipping 14 matching lines @@
 
   // Stores SkTraceMemoryDump for the current ProcessMemoryDump.
   ScopedVector<skia::SkiaTraceMemoryDumpImpl> sk_trace_dump_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WebProcessMemoryDumpImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEB_PROCESS_MEMORY_DUMP_IMPL_H_