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

content/child/web_process_memory_dump_impl.cc

 // 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.
 
-#include "platform/web_process_memory_dump_impl.h"
+#include "content/child/web_process_memory_dump_impl.h"
 
 #include <stddef.h>
 
 #include "base/memory/discardable_memory.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/heap_profiler_heap_dump_writer.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/trace_event/trace_event_memory_overhead.h"
-#include "platform/web_memory_allocator_dump_impl.h"
+#include "content/child/web_memory_allocator_dump_impl.h"
 #include "skia/ext/skia_trace_memory_dump_impl.h"
 
-namespace blink {
+namespace content {
 
 WebProcessMemoryDumpImpl::WebProcessMemoryDumpImpl()
     : owned_process_memory_dump_(
           new base::trace_event::ProcessMemoryDump(nullptr)),
       process_memory_dump_(owned_process_memory_dump_.get()),
       level_of_detail_(base::trace_event::MemoryDumpLevelOfDetail::DETAILED) {}
 
 WebProcessMemoryDumpImpl::WebProcessMemoryDumpImpl(
     base::trace_event::MemoryDumpLevelOfDetail level_of_detail,
     base::trace_event::ProcessMemoryDump* process_memory_dump)
@@ skipping 30 matching lines @@
     base::trace_event::MemoryAllocatorDump* memory_allocator_dump) {
   if (!memory_allocator_dump)
     return nullptr;
 
   // Wrap it and return to blink.
   WebMemoryAllocatorDumpImpl* web_memory_allocator_dump_impl =
       new WebMemoryAllocatorDumpImpl(memory_allocator_dump);
 
   // memory_allocator_dumps_ will take ownership of
   // |web_memory_allocator_dumpd_impl|.
-  memory_allocator_dumps_.set(
-      memory_allocator_dump, adoptPtr(web_memory_allocator_dump_impl));
+  memory_allocator_dumps_.set(memory_allocator_dump,
+                              make_scoped_ptr(web_memory_allocator_dump_impl));
   return web_memory_allocator_dump_impl;
 }
 
 blink::WebMemoryAllocatorDump* WebProcessMemoryDumpImpl::getMemoryAllocatorDump(
     const blink::WebString& absolute_name) const {
   // Retrieve the base MemoryAllocatorDump object and then reverse lookup
   // its wrapper.
   base::trace_event::MemoryAllocatorDump* memory_allocator_dump =
       process_memory_dump_->GetAllocatorDump(absolute_name.utf8());
   if (!memory_allocator_dump)
@@ skipping 24 matching lines @@
   // In order to expose the move and ownership transfer semantics of the
   // underlying ProcessMemoryDump, we need to:
 
   // 1) Move and transfer the ownership of the wrapped
   // base::trace_event::MemoryAllocatorDump(s) instances.
   process_memory_dump_->TakeAllDumpsFrom(other_impl->process_memory_dump_);
 
   // 2) Move and transfer the ownership of the WebMemoryAllocatorDump wrappers.
   const size_t expected_final_size = memory_allocator_dumps_.size() +
                                      other_impl->memory_allocator_dumps_.size();
-  while (!other_impl->memory_allocator_dumps_.isEmpty()) {
+  while (!other_impl->memory_allocator_dumps_.empty()) {
     auto first_entry = other_impl->memory_allocator_dumps_.begin();
     base::trace_event::MemoryAllocatorDump* memory_allocator_dump =
-        first_entry->key;
-    memory_allocator_dumps_.set(memory_allocator_dump,
-        other_impl->memory_allocator_dumps_.take(memory_allocator_dump));
+        first_entry->first;
+    memory_allocator_dumps_.set(
+        memory_allocator_dump,
+        other_impl->memory_allocator_dumps_.take_and_erase(first_entry));
   }
   DCHECK_EQ(expected_final_size, memory_allocator_dumps_.size());
-  DCHECK(other_impl->memory_allocator_dumps_.isEmpty());
+  DCHECK(other_impl->memory_allocator_dumps_.empty());
 }
 
 void WebProcessMemoryDumpImpl::addOwnershipEdge(
     blink::WebMemoryAllocatorDumpGuid source,
     blink::WebMemoryAllocatorDumpGuid target,
     int importance) {
   process_memory_dump_->AddOwnershipEdge(
       base::trace_event::MemoryAllocatorDumpGuid(source),
       base::trace_event::MemoryAllocatorDumpGuid(target), importance);
 }
 
 void WebProcessMemoryDumpImpl::addOwnershipEdge(
     blink::WebMemoryAllocatorDumpGuid source,
     blink::WebMemoryAllocatorDumpGuid target) {
   process_memory_dump_->AddOwnershipEdge(
       base::trace_event::MemoryAllocatorDumpGuid(source),
       base::trace_event::MemoryAllocatorDumpGuid(target));
 }
 
 void WebProcessMemoryDumpImpl::addSuballocation(
     blink::WebMemoryAllocatorDumpGuid source,
     const blink::WebString& target_node_name) {
   process_memory_dump_->AddSuballocation(
       base::trace_event::MemoryAllocatorDumpGuid(source),
       target_node_name.utf8());
 }
 
 SkTraceMemoryDump* WebProcessMemoryDumpImpl::createDumpAdapterForSkia(
     const blink::WebString& dump_name_prefix) {
-  sk_trace_dump_list_.push_back(make_scoped_ptr(
-      new skia::SkiaTraceMemoryDumpImpl(
-          dump_name_prefix.utf8(), level_of_detail_, process_memory_dump_)));
-  return sk_trace_dump_list_.back().get();
+  sk_trace_dump_list_.push_back(new skia::SkiaTraceMemoryDumpImpl(
+      dump_name_prefix.utf8(), level_of_detail_, process_memory_dump_));
+  return sk_trace_dump_list_.back();
 }
 
 blink::WebMemoryAllocatorDump*
 WebProcessMemoryDumpImpl::CreateDiscardableMemoryAllocatorDump(
     const std::string& name,
     base::DiscardableMemory* discardable) {
   base::trace_event::MemoryAllocatorDump* dump =
       discardable->CreateMemoryAllocatorDump(name.c_str(),
                                              process_memory_dump_);
   return createWebMemoryAllocatorDump(dump);
@@ skipping 10 matching lines @@
       bytes_by_context,
       session_state->stack_frame_deduplicator(),
       session_state->type_name_deduplicator());
   process_memory_dump_->AddHeapDump(allocator_name, heap_dump);
   std::string base_name = base::StringPrintf("tracing/heap_profiler_%s",
                                              allocator_name);
   overhead.DumpInto(base_name.c_str(), process_memory_dump_);
 }
 
 }  // namespace content