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

content/browser/profiler_controller_impl.h

Index: content/browser/profiler_controller_impl.h
diff --git a/content/browser/profiler_controller_impl.h b/content/browser/profiler_controller_impl.h
index ff361ea6e504834a4e65ec78659a0714cd9983a5..f405efca2b4e9dacc91687b734b606919ba5bfa8 100644
--- a/content/browser/profiler_controller_impl.h
+++ b/content/browser/profiler_controller_impl.h
@@ -6,14 +6,18 @@
 #define CONTENT_BROWSER_PROFILER_CONTROLLER_IMPL_H_
 
 #include "base/memory/singleton.h"
-#include "base/tracked_objects.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/profiler_controller.h"
+#include "content/public/common/process_type.h"
+
+namespace tracked_objects {
+struct SerializedProcessData;
+}
 
 namespace content {
 
 // ProfilerController's implementation.
-class CONTENT_EXPORT ProfilerControllerImpl : public ProfilerController {
+class ProfilerControllerImpl : public ProfilerController {
  public:
   static ProfilerControllerImpl* GetInstance();
 
@@ -22,21 +26,21 @@ class CONTENT_EXPORT ProfilerControllerImpl : public ProfilerController {
   ProfilerControllerImpl();
   virtual ~ProfilerControllerImpl();
 
-  // Send number of pending processes to subscriber_. |end| is set to true if it
-  // is the last time. This is called on UI thread.
+  // Send the number of |pending_processes| to |subscriber_|. |end| is set to

[jar (doing other things), 2012/04/04 17:55:35]

This comment seemed very hard to read and understand... so I'd suggest:

Notify the |subscriber_| that it should expect data from at least
|pending_processes| additional distinct notifications.  OnPendingProcess may be
called repeatedly, and the last call should have |end| set to true (indicating
that there is no longer a possibility for the count of pending processes to
increase).

[Ilya Sherman, 2012/04/05 02:51:04]

Done (with some further tweaks to the wording).

+  // true if it is the last time. This is called on the UI thread.
   void OnPendingProcesses(int sequence_number, int pending_processes, bool end);
 
-  // Send profiler_data back to subscriber_. subscriber_ assumes the ownership
-  // of profiler_data. This is called on UI thread.
-  void OnProfilerDataCollected(int sequence_number,
-                               base::DictionaryValue* profiler_data);
+  // Send the |profiler_data| back to the |subscriber_|.
+  // This is called on the UI thread.
+  void OnProfilerDataCollected(
+      int sequence_number,
+      const tracked_objects::SerializedProcessData& profiler_data,
+      content::ProcessType process_type);
 
   // ProfilerController implementation:
   virtual void Register(ProfilerSubscriber* subscriber) OVERRIDE;
-  virtual void Unregister(ProfilerSubscriber* subscriber) OVERRIDE;
+  virtual void Unregister(const ProfilerSubscriber* subscriber) OVERRIDE;
   virtual void GetProfilerData(int sequence_number) OVERRIDE;
-  virtual void SetProfilerStatus(
-      tracked_objects::ThreadData::Status status) OVERRIDE;
 
  private:
   friend struct DefaultSingletonTraits<ProfilerControllerImpl>;
@@ -44,10 +48,6 @@ class CONTENT_EXPORT ProfilerControllerImpl : public ProfilerController {
   // Contact child processes and get their profiler data.
   void GetProfilerDataFromChildProcesses(int sequence_number);
 
-  // Contact child processes and set profiler status to |enable|.
-  void SetProfilerStatusInChildProcesses(
-      tracked_objects::ThreadData::Status status);
-
   ProfilerSubscriber* subscriber_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfilerControllerImpl);
@@ -56,4 +56,3 @@ class CONTENT_EXPORT ProfilerControllerImpl : public ProfilerController {
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PROFILER_CONTROLLER_IMPL_H_
-