[UMA] Use proper C++ objects to serialize tracked_objects across process boundaries.

content/common/child_process_messages.h

Index: content/common/child_process_messages.h
diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h
index ab56be07f6185676c166b12c4629e8b64ce146c2..363c556a572d9766847b8b1fe0b74ae381d48162 100644
--- a/content/common/child_process_messages.h
+++ b/content/common/child_process_messages.h
@@ -14,6 +14,44 @@
 
 IPC_ENUM_TRAITS(tracked_objects::ThreadData::Status)
 
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::LocationSnapshot)
+  IPC_STRUCT_TRAITS_MEMBER(file_name)
+  IPC_STRUCT_TRAITS_MEMBER(function_name)
+  IPC_STRUCT_TRAITS_MEMBER(line_number)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::BirthOnThreadSnapshot)
+  IPC_STRUCT_TRAITS_MEMBER(location)
+  IPC_STRUCT_TRAITS_MEMBER(thread_name)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::DeathDataSnapshot)
+  IPC_STRUCT_TRAITS_MEMBER(count)
+  IPC_STRUCT_TRAITS_MEMBER(run_duration_sum)
+  IPC_STRUCT_TRAITS_MEMBER(run_duration_max)
+  IPC_STRUCT_TRAITS_MEMBER(run_duration_sample)
+  IPC_STRUCT_TRAITS_MEMBER(queue_duration_sum)
+  IPC_STRUCT_TRAITS_MEMBER(queue_duration_max)
+  IPC_STRUCT_TRAITS_MEMBER(queue_duration_sample)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::TaskSnapshot)
+  IPC_STRUCT_TRAITS_MEMBER(birth)
+  IPC_STRUCT_TRAITS_MEMBER(death_data)
+  IPC_STRUCT_TRAITS_MEMBER(death_thread_name)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ParentChildPairSnapshot)
+  IPC_STRUCT_TRAITS_MEMBER(parent)
+  IPC_STRUCT_TRAITS_MEMBER(child)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataSnapshot)
+  IPC_STRUCT_TRAITS_MEMBER(tasks)
+  IPC_STRUCT_TRAITS_MEMBER(descendants)
+  IPC_STRUCT_TRAITS_MEMBER(process_id)
+IPC_STRUCT_TRAITS_END()
+
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
@@ -48,9 +86,8 @@ IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetProfilerStatus,
 
 // Send to all the child processes to send back profiler data (ThreadData in
 // tracked_objects).
-IPC_MESSAGE_CONTROL2(ChildProcessMsg_GetChildProfilerData,
-                     int,         /* sequence number. */
-                     std::string  /* pickled Value of process type. */)
+IPC_MESSAGE_CONTROL1(ChildProcessMsg_GetChildProfilerData,
+                     int /* sequence number */)
 
 // Sent to child processes to dump their handle table.
 IPC_MESSAGE_CONTROL0(ChildProcessMsg_DumpHandles)
@@ -80,8 +117,8 @@ IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_TraceBufferPercentFullReply,
 
 // Send back profiler data (ThreadData in tracked_objects).
 IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_ChildProfilerData,
-                     int, /* sequence number. */
-                     DictionaryValue /* profiler data. */)
+                     int, /* sequence number */
+                     tracked_objects::ProcessDataSnapshot /* profiler data */)
 
 // Reply to ChildProcessMsg_DumpHandles when handle table dump is complete.
 IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_DumpHandlesDone)