Index: content/common/child_process_messages.h |
diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h |
index 0eda94253a0e8f9d06dc8d0f3d12f25812e6fb3b..830cd62be0a3d48b16180cc70c050e764a7a62c5 100644 |
--- a/content/common/child_process_messages.h |
+++ b/content/common/child_process_messages.h |
@@ -52,9 +52,13 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ParentChildPairSnapshot) |
IPC_STRUCT_TRAITS_MEMBER(child) |
IPC_STRUCT_TRAITS_END() |
-IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataSnapshot) |
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataPhaseSnapshot) |
IPC_STRUCT_TRAITS_MEMBER(tasks) |
IPC_STRUCT_TRAITS_MEMBER(descendants) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataSnapshot) |
+ IPC_STRUCT_TRAITS_MEMBER(phased_process_data_snapshots) |
IPC_STRUCT_TRAITS_MEMBER(process_id) |
IPC_STRUCT_TRAITS_END() |
@@ -124,9 +128,10 @@ IPC_MESSAGE_CONTROL0(ChildProcessMsg_GetTcmallocStats) |
IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_ShutdownRequest) |
// Send back profiler data (ThreadData in tracked_objects). |
-IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_ChildProfilerData, |
- int, /* sequence_number */ |
- tracked_objects::ProcessDataSnapshot /* profiler_data */) |
+IPC_MESSAGE_CONTROL2( |
+ ChildProcessHostMsg_ChildProfilerData, |
+ int, /* sequence_number */ |
+ tracked_objects::ProcessDataSnapshot /* process_data_snapshot */) |
// Send back histograms as vector of pickled-histogram strings. |
IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_ChildHistogramData, |