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

content/common/child_thread.cc

Index: content/common/child_thread.cc
diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc
index c4061b3a8ab4e6b7a6c0ccd33e185031767e73f5..15cf31fa0490a05bcac617ffed7a3323334b80fc 100644
--- a/content/common/child_thread.cc
+++ b/content/common/child_thread.cc
@@ -7,7 +7,6 @@
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/process.h"
-#include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
 #include "content/common/child_process.h"
@@ -18,6 +17,7 @@
 #include "content/common/resource_dispatcher.h"
 #include "content/common/socket_stream_dispatcher.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/serialized_profiler_data.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
@@ -28,6 +28,8 @@
 #include "content/common/handle_enumerator_win.h"
 #endif
 
+using tracked_objects::ThreadData;
+
 ChildThread::ChildThread() {
   channel_name_ = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
       switches::kProcessChannelID);
@@ -219,21 +221,17 @@ void ChildThread::OnSetIPCLoggingEnabled(bool enable) {
 }
 #endif  //  IPC_MESSAGE_LOG_ENABLED
 
-void ChildThread::OnSetProfilerStatus(
-    tracked_objects::ThreadData::Status status) {
-  tracked_objects::ThreadData::InitializeAndSetTrackingStatus(status);
+void ChildThread::OnSetProfilerStatus(ThreadData::Status status) {
+  ThreadData::InitializeAndSetTrackingStatus(status);
 }
 
-void ChildThread::OnGetChildProfilerData(
-    int sequence_number,
-    const std::string& process_type) {
-  scoped_ptr<base::DictionaryValue> value(
-      tracked_objects::ThreadData::ToValue(false));
-  value->SetString("process_type", process_type);
-  value->SetInteger("process_id", base::GetCurrentProcId());
+void ChildThread::OnGetChildProfilerData(int sequence_number,
+                                         content::ProcessType process_type) {
+  content::SerializedProfilerData profiler_data(process_type);
+  ThreadData::ToSerializedProcessData(false, &profiler_data);
 
-  Send(new ChildProcessHostMsg_ChildProfilerData(
-      sequence_number, *value.get()));
+  Send(new ChildProcessHostMsg_ChildProfilerData(sequence_number,
+                                                 profiler_data));
 }
 
 void ChildThread::OnDumpHandles() {