Refactoring: Move some classes from content/child to platform

third_party/WebKit/Source/platform/WebProcessMemoryDumpImpl.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_
+#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 "wtf/Vector.h"
 
 namespace base {
 class DiscardableMemory;
 namespace trace_event {
 class MemoryAllocatorDump;
 class ProcessMemoryDump;
 }  // namespace base
 }  // namespace trace_event
 
 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 BLINK_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 34 matching lines @@
       base::trace_event::TraceEventMemoryOverhead& overhead,
       const char* allocator_name) override;
 
  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_;
+  WTF::OwnPtr<base::trace_event::ProcessMemoryDump> owned_process_memory_dump_;

[haraken, 2016/02/15 09:40:49]

It looks strange to use WTF::OwnPtr for Chromium classes. We should keep using
scoped_ptr.

However, if you need to introduce a bunch of scoped_ptr and scoped_refptr to
Blink's platform (like this CL), it implies that you're doing something strange.
This CL is just moving glue classes from content/ to platform/ without removing
any code. As primiano@ pointed out, I don't see much advantage of doing the
migration.

[hajimehoshi, 2016/02/18 11:21:53]

You mean we should use smart pointers in base for Chromium (and base) classes?
This is NOT a necessary change as long as platform can depend on base's smart
pointers.

 
   // The underlying ProcessMemoryDump instance to which the
   // createMemoryAllocatorDump() calls will be proxied to.
   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.
-  base::ScopedPtrHashMap<base::trace_event::MemoryAllocatorDump*,
-                         scoped_ptr<WebMemoryAllocatorDumpImpl>>
+  WTF::HashMap<base::trace_event::MemoryAllocatorDump*,
+               OwnPtr<WebMemoryAllocatorDumpImpl>>
       memory_allocator_dumps_;
 
   // Stores SkTraceMemoryDump for the current ProcessMemoryDump.
-  ScopedVector<skia::SkiaTraceMemoryDumpImpl> sk_trace_dump_list_;
+  WTF::Vector<WTF::OwnPtr<skia::SkiaTraceMemoryDumpImpl>> sk_trace_dump_list_;

[hajimehoshi, 2016/02/18 11:21:53]

On the other hand, ScopedVector is not permitted in platform and I had to use
WTF::OwnPtr here. Is this correct?

 
   DISALLOW_COPY_AND_ASSIGN(WebProcessMemoryDumpImpl);
 };
 
-}  // namespace content
+}  // namespace blink
 
-#endif  // CONTENT_CHILD_WEB_PROCESS_MEMORY_DUMP_IMPL_H_
+#endif  // WebProcessMemoryDumpImpl_h