Chromium Code Reviews| Index: third_party/WebKit/Source/platform/WebProcessMemoryDumpImpl.h |
| diff --git a/content/child/web_process_memory_dump_impl.h b/third_party/WebKit/Source/platform/WebProcessMemoryDumpImpl.h |
| similarity index 92% |
| rename from content/child/web_process_memory_dump_impl.h |
| rename to third_party/WebKit/Source/platform/WebProcessMemoryDumpImpl.h |
| index 9e7b8707f70eda07c4839015c495bddce5d230d6..840f1e8bb63b4e0bbf697136417c73595a550606 100644 |
| --- a/content/child/web_process_memory_dump_impl.h |
| +++ b/third_party/WebKit/Source/platform/WebProcessMemoryDumpImpl.h |
| @@ -2,8 +2,8 @@ |
| // 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" |
| @@ -11,8 +11,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "base/memory/scoped_vector.h" |
|
kinuko
2016/02/04 11:25:34
Hmm... I haven't realized but are we just going to
haraken
2016/02/04 11:30:56
We don't want to allow scoped_ptr.
By the way, wh
hajimehoshi
2016/02/04 12:17:52
Done.
|
| #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" |
| namespace base { |
| class DiscardableMemory; |
| @@ -26,14 +25,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 BLINK_EXPORT WebProcessMemoryDumpImpl final |
| : public NON_EXPORTED_BASE(blink::WebProcessMemoryDump) { |
| public: |
| // Creates a standalone WebProcessMemoryDumpImp, which owns the underlying |
| @@ -112,6 +111,6 @@ class CONTENT_EXPORT WebProcessMemoryDumpImpl final |
| DISALLOW_COPY_AND_ASSIGN(WebProcessMemoryDumpImpl); |
| }; |
| -} // namespace content |
| +} // namespace blink |
| -#endif // CONTENT_CHILD_WEB_PROCESS_MEMORY_DUMP_IMPL_H_ |
| +#endif // WebProcessMemoryDumpImpl_h |