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 fdd9c7d029af6792d08d025ad1d2f2d2d385d480..55d916b9137ea944032107fe18838f8643b7ee2e 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 |
@@ -8,13 +8,13 @@ |
#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/cpp/resource_coordinator_export.h" |
+#include "services/resource_coordinator/public/cpp/memory/memory_export.h" |
#include "services/resource_coordinator/public/interfaces/memory/memory_instrumentation.mojom.h" |
namespace mojo { |
template <> |
-struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_EXPORT |
+struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT |
EnumTraits<memory_instrumentation::mojom::DumpType, |
base::trace_event::MemoryDumpType> { |
static memory_instrumentation::mojom::DumpType ToMojom( |
@@ -24,7 +24,7 @@ |
}; |
template <> |
-struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_EXPORT |
+struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT |
EnumTraits<memory_instrumentation::mojom::LevelOfDetail, |
base::trace_event::MemoryDumpLevelOfDetail> { |
static memory_instrumentation::mojom::LevelOfDetail ToMojom( |
@@ -34,7 +34,7 @@ |
}; |
template <> |
-struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_EXPORT |
+struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT |
StructTraits<memory_instrumentation::mojom::RequestArgsDataView, |
base::trace_event::MemoryDumpRequestArgs> { |
static uint64_t dump_guid( |
@@ -54,7 +54,7 @@ |
}; |
template <> |
-struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_EXPORT |
+struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT |
StructTraits<memory_instrumentation::mojom::ChromeMemDumpDataView, |
base::trace_event::MemoryDumpCallbackResult::ChromeMemDump> { |
static uint32_t malloc_total_kb( |
@@ -79,7 +79,7 @@ |
}; |
template <> |
-struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_EXPORT |
+struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT |
StructTraits<memory_instrumentation::mojom::OSMemDumpDataView, |
base::trace_event::MemoryDumpCallbackResult::OSMemDump> { |
static uint32_t resident_set_kb( |
@@ -91,7 +91,7 @@ |
}; |
template <> |
-struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_EXPORT StructTraits< |
+struct SERVICES_RESOURCE_COORDINATOR_PUBLIC_CPP_MEMORY_EXPORT StructTraits< |
memory_instrumentation::mojom::MemoryDumpCallbackResultDataView, |
base::trace_event::MemoryDumpCallbackResult> { |
static base::trace_event::MemoryDumpCallbackResult::OSMemDump os_dump( |