Chromium Code Reviews| Index: services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h |
| diff --git a/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h b/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h |
| index c9c6770b78382ba7a4c0a5424f6f76c7d40b16c9..65972d1b604e168ed285f2eb4a6e061ccce53997 100644 |
| --- a/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h |
| +++ b/services/resource_coordinator/public/cpp/memory/memory_instrumentation_struct_traits.h |
| @@ -5,7 +5,9 @@ |
| #ifndef SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_MEMORY_INSTRUMENTATION_STRUCT_TRAITS_H_ |
| #define SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_MEMORY_INSTRUMENTATION_STRUCT_TRAITS_H_ |
| +#include "base/process/process_handle.h" |
| #include "base/trace_event/memory_dump_request_args.h" |
| +#include "mojo/common/common_custom_types_struct_traits.h" |
| #include "services/resource_coordinator/public/interfaces/memory/memory_instrumentation.mojom.h" |
| namespace mojo { |
| @@ -95,6 +97,12 @@ struct StructTraits< |
| const base::trace_event::MemoryDumpCallbackResult& args) { |
| return args.chrome_dump; |
| } |
| + static std::map<base::ProcessId, |
|
Ken Rockot(use gerrit already)
2017/04/19 21:19:37
This should return a const ref, otherwise it will
fmeawad
2017/04/19 21:40:21
Done.
|
| + base::trace_event::MemoryDumpCallbackResult::OSMemDump> |
| + extra_processes_dump( |
| + const base::trace_event::MemoryDumpCallbackResult& args) { |
| + return args.extra_processes_dump; |
| + } |
| static bool Read( |
| memory_instrumentation::mojom::MemoryDumpCallbackResultDataView input, |
| base::trace_event::MemoryDumpCallbackResult* out); |