Collect profiler stats from browser child processes.

chrome/renderer/renderer_tracking.cc

Index: chrome/renderer/renderer_tracking.cc
===================================================================
--- chrome/renderer/renderer_tracking.cc	(revision 110669)
+++ chrome/renderer/renderer_tracking.cc	(working copy)
@@ -27,36 +27,44 @@
 bool RendererTracking::OnControlMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RendererTracking, message)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_GetRendererTrackedData,
-                        OnGetRendererTrackingData)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetTrackingStatus,
-                        OnSetTrackingStatus)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_GetRendererProfilerData,

[jam, 2011/11/19 23:36:25]

this whole file, and these chrome specific messages, aren't necessary anymore.
since the code for all the other child processes is in ChildThread, it also gets
used by the renderer process.

in the browser side, do a "AddFilter(new ProfilerMessageFilter);" in
RenderProcessHostImpl

[ramant (doing other things), 2011/11/25 23:59:48]

Done.

+                        OnGetRendererProfilerData)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetProfilerStatus,
+                        OnSetProfilerStatus)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void RendererTracking::OnGetRendererTrackingData(int sequence_number) {
+void RendererTracking::OnGetRendererProfilerData(
+    int sequence_number,
+    const std::string& process_type) {
   RenderThread::Get()->GetMessageLoop()->PostTask(FROM_HERE,
       renderer_tracking_factory_.NewRunnableMethod(
-          &RendererTracking::UploadAllTrackingData,
-          sequence_number));
+          &RendererTracking::UploadAllProfilerData,
+          sequence_number,
+          process_type));
 }
 
-void RendererTracking::OnSetTrackingStatus(bool enable) {
+void RendererTracking::OnSetProfilerStatus(bool enable) {
   tracked_objects::ThreadData::InitializeAndSetTrackingStatus(enable);
 }
 
-void RendererTracking::UploadAllTrackingData(int sequence_number) {
+void RendererTracking::UploadAllProfilerData(
+    int sequence_number,
+    const std::string& process_type) {
+  // Get profiler data.
   scoped_ptr<base::DictionaryValue> value(
       tracked_objects::ThreadData::ToValue());
+
+  value->SetString("process_type", process_type);
   value->SetInteger("process_id", base::GetCurrentProcId());
 
-  std::string pickled_tracking_data;
-  base::JSONWriter::Write(value.get(), false, &pickled_tracking_data);
+  std::string pickled_profiler_data;
+  base::JSONWriter::Write(value.get(), false, &pickled_profiler_data);
 
-  // Send the sequence number and list of pickled tracking data over synchronous
-  // IPC, so we can clear pickled_tracking_data_ afterwards.
-  RenderThread::Get()->Send(new ChromeViewHostMsg_RendererTrackedData(
-      sequence_number, pickled_tracking_data));
+  // Send the sequence number and list of pickled profiler data over synchronous
+  // IPC, so we can clear pickled_profiler_data_ afterwards.
+  RenderThread::Get()->Send(new ChromeViewHostMsg_RendererProfilerData(
+      sequence_number, pickled_profiler_data));
 }