Revert of Refactoring: Move some classes from content/child to platform (patchset #17 id:320001 of …

content/child/web_process_memory_dump_impl.h

Index: content/child/web_process_memory_dump_impl.h
diff --git a/third_party/WebKit/Source/platform/web_process_memory_dump_impl.h b/content/child/web_process_memory_dump_impl.h
similarity index 84%
rename from third_party/WebKit/Source/platform/web_process_memory_dump_impl.h
rename to content/child/web_process_memory_dump_impl.h
index 77754492f45cf0c71dfba9aa63592fffabd55077..9e7b8707f70eda07c4839015c495bddce5d230d6 100644
--- a/third_party/WebKit/Source/platform/web_process_memory_dump_impl.h
+++ b/content/child/web_process_memory_dump_impl.h
@@ -2,18 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WebProcessMemoryDumpImpl_h
-#define WebProcessMemoryDumpImpl_h
+#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"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/trace_event/memory_dump_request_args.h"
-#include "public/platform/WebProcessMemoryDump.h"
-#include "wtf/HashMap.h"
-#include "wtf/OwnPtr.h"
-
-#include <map>
-#include <vector>
+#include "content/common/content_export.h"
+#include "third_party/WebKit/public/platform/WebProcessMemoryDump.h"
 
 namespace base {
 class DiscardableMemory;
@@ -27,14 +26,14 @@ namespace skia {
 class SkiaTraceMemoryDumpImpl;
 }  // namespace skia
 
-namespace blink {
+namespace content {
 
 class WebMemoryAllocatorDumpImpl;
 
 // Implements the blink::WebProcessMemoryDump interface by means of proxying the
 // calls to createMemoryAllocatorDump() to the underlying
 // base::trace_event::ProcessMemoryDump instance.
-class PLATFORM_EXPORT WebProcessMemoryDumpImpl final
+class CONTENT_EXPORT WebProcessMemoryDumpImpl final
     : public NON_EXPORTED_BASE(blink::WebProcessMemoryDump) {
  public:
   // Creates a standalone WebProcessMemoryDumpImp, which owns the underlying
@@ -103,15 +102,16 @@ class PLATFORM_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.
-  HashMap<base::trace_event::MemoryAllocatorDump*,
-          OwnPtr<WebMemoryAllocatorDumpImpl>> memory_allocator_dumps_;
+  base::ScopedPtrHashMap<base::trace_event::MemoryAllocatorDump*,
+                         scoped_ptr<WebMemoryAllocatorDumpImpl>>
+      memory_allocator_dumps_;
 
   // Stores SkTraceMemoryDump for the current ProcessMemoryDump.
-  std::vector<scoped_ptr<skia::SkiaTraceMemoryDumpImpl>> sk_trace_dump_list_;
+  ScopedVector<skia::SkiaTraceMemoryDumpImpl> sk_trace_dump_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WebProcessMemoryDumpImpl);
 };
 
-}  // namespace blink
+}  // namespace content
 
-#endif  // WebProcessMemoryDumpImpl_h
+#endif  // CONTENT_CHILD_WEB_PROCESS_MEMORY_DUMP_IMPL_H_