[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..032aef45ef1abb994379cfff709dbbc4d1f874e1 100644
--- a/content/common/child_process_messages.h
+++ b/content/common/child_process_messages.h
@@ -9,11 +9,47 @@
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "content/common/content_export.h"
+#include "content/public/common/process_type.h"
+#include "content/public/common/serialized_profiler_data.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 
+IPC_ENUM_TRAITS(content::ProcessType)
 IPC_ENUM_TRAITS(tracked_objects::ThreadData::Status)
 
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::SerializedLocation)
+  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::SerializedBirthOnThread)
+  IPC_STRUCT_TRAITS_MEMBER(location)
+  IPC_STRUCT_TRAITS_MEMBER(thread_name)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(tracked_objects::SerializedDeathData)
+  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::SerializedSnapshot)
+  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(content::SerializedProfilerData)
+  IPC_STRUCT_TRAITS_MEMBER(snapshots)
+  IPC_STRUCT_TRAITS_MEMBER(process_id)
+  IPC_STRUCT_TRAITS_MEMBER(process_type)
+IPC_STRUCT_TRAITS_END()
+
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
@@ -49,8 +85,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. */)
+                     int,                  /* sequence number */
+                     content::ProcessType  /* child process type */)
 
 // Sent to child processes to dump their handle table.
 IPC_MESSAGE_CONTROL0(ChildProcessMsg_DumpHandles)
@@ -80,8 +116,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 */
+                     content::SerializedProfilerData  /* profiler data */)
 
 // Reply to ChildProcessMsg_DumpHandles when handle table dump is complete.
 IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_DumpHandlesDone)