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

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 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;
 namespace trace_event {
 class MemoryAllocatorDump;
 class ProcessMemoryDump;
 }  // namespace base
 }  // namespace trace_event
 
 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
   // ProcessMemoryDump.
   WebProcessMemoryDumpImpl();
 
   // Wraps (without owning) an existing ProcessMemoryDump.
   explicit WebProcessMemoryDumpImpl(
       base::trace_event::MemoryDumpLevelOfDetail level_of_detail,
       base::trace_event::ProcessMemoryDump* process_memory_dump);
@@ skipping 48 matching lines @@
   base::trace_event::ProcessMemoryDump* process_memory_dump_;  // Not owned.
 
   // TODO(ssid): Remove it once this information is added to ProcessMemoryDump.
   base::trace_event::MemoryDumpLevelOfDetail level_of_detail_;
 
   // Reverse index of MemoryAllocatorDump -> WebMemoryAllocatorDumpImpl wrapper.
   // By design WebMemoryDumpProvider(s) are not supposed to hold the pointer
   // 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_