Refactoring: Move some classes from content/child to platform

third_party/WebKit/Source/platform/web_process_memory_dump_impl.h

Index: third_party/WebKit/Source/platform/web_process_memory_dump_impl.h
diff --git a/content/child/web_process_memory_dump_impl.h b/third_party/WebKit/Source/platform/web_process_memory_dump_impl.h
similarity index 85%
rename from content/child/web_process_memory_dump_impl.h
rename to third_party/WebKit/Source/platform/web_process_memory_dump_impl.h
index 9e7b8707f70eda07c4839015c495bddce5d230d6..8e940893ccf92327f390010e1f7be25c211338bd 100644
--- a/content/child/web_process_memory_dump_impl.h
+++ b/third_party/WebKit/Source/platform/web_process_memory_dump_impl.h
@@ -2,17 +2,18 @@
 // 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_
+#ifndef WebProcessMemoryDumpImpl_h
+#define WebProcessMemoryDumpImpl_h
 
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
 #include "base/trace_event/memory_dump_request_args.h"
-#include "content/common/content_export.h"
-#include "third_party/WebKit/public/platform/WebProcessMemoryDump.h"
+#include "public/platform/WebProcessMemoryDump.h"
+#include "wtf/HashMap.h"
+#include "wtf/OwnPtr.h"
+
+#include <map>
+#include <vector>
 
 namespace base {
 class DiscardableMemory;
@@ -26,14 +27,14 @@ namespace skia {
 class SkiaTraceMemoryDumpImpl;
 }  // namespace skia
 
-namespace content {
+namespace blink {
 
 class WebMemoryAllocatorDumpImpl;
 
 // Implements the blink::WebProcessMemoryDump interface by means of proxying the
 // calls to createMemoryAllocatorDump() to the underlying
 // base::trace_event::ProcessMemoryDump instance.
-class CONTENT_EXPORT WebProcessMemoryDumpImpl final
+class WebProcessMemoryDumpImpl final
     : public NON_EXPORTED_BASE(blink::WebProcessMemoryDump) {
  public:
   // Creates a standalone WebProcessMemoryDumpImp, which owns the underlying
@@ -102,16 +103,16 @@ class CONTENT_EXPORT WebProcessMemoryDumpImpl final
   // to the WebProcessMemoryDump passed as argument of the onMemoryDump() call.
   // Those pointers are valid only within the scope of the call and can be
   // safely torn down once the WebProcessMemoryDumpImpl itself is destroyed.
-  base::ScopedPtrHashMap<base::trace_event::MemoryAllocatorDump*,
-                         scoped_ptr<WebMemoryAllocatorDumpImpl>>
+  std::unordered_map<base::trace_event::MemoryAllocatorDump*,
+                     scoped_ptr<WebMemoryAllocatorDumpImpl>>

[haraken, 2016/02/23 10:37:01]

Can we use a HashMap<base::trace_event::MemoryAllocatorDump*,
OwnPtr<WebMemoryAllocatorDumpImp>>?

Given that WebMemoryAllocatorDumpImpl is now in the Blink side, we should use an
OwnPtr.

However, if you're planning to remove the WebMemoryAllocatorDumpImpl in the next
CL (and replace it with WebMemoryAllocatorDump?), I'm fine with keeping using
the scoped_ptr in this CL.

[hajimehoshi, 2016/02/23 11:10:39]

This implementation is not removed but just will be unified with
WebMemoryAllocatorDump, so I need to fix as you said anyway. Done.

       memory_allocator_dumps_;
 
   // Stores SkTraceMemoryDump for the current ProcessMemoryDump.
-  ScopedVector<skia::SkiaTraceMemoryDumpImpl> sk_trace_dump_list_;
+  std::vector<scoped_ptr<skia::SkiaTraceMemoryDumpImpl>> sk_trace_dump_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WebProcessMemoryDumpImpl);
 };
 
-}  // namespace content
+}  // namespace blink
 
-#endif  // CONTENT_CHILD_WEB_PROCESS_MEMORY_DUMP_IMPL_H_
+#endif  // WebProcessMemoryDumpImpl_h