Revert 120789 - Propogate status setting for profiler to track parents

base/tracked_objects.h

Index: base/tracked_objects.h
===================================================================
--- base/tracked_objects.h	(revision 120816)
+++ base/tracked_objects.h	(working copy)
@@ -442,17 +442,15 @@
   // PROFILING_ACTIVE (i.e., it can't be set to a higher level than what is
   // compiled into the binary, and parent-child tracking at the
   // PROFILING_CHILDREN_ACTIVE level might not be compiled in).
-  static bool InitializeAndSetTrackingStatus(Status status);
+  static bool InitializeAndSetTrackingStatus(bool status);
 
-  static Status status();
-
   // Indicate if any sort of profiling is being done (i.e., we are more than
   // DEACTIVATED).
-  static bool TrackingStatus();
+  static bool tracking_status();
 
   // For testing only, indicate if the status of parent-child tracking is turned
-  // on.  This is currently a compiled option, atop TrackingStatus().
-  static bool TrackingParentChildStatus();
+  // on.  This is currently a compiled option, atop tracking_status().
+  static bool tracking_parent_child_status();
 
   // Special versions of Now() for getting times at start and end of a tracked
   // run.  They are super fast when tracking is disabled, and have some internal
Property changes on: base/tracked_objects.h
___________________________________________________________________
Added: svn:mergeinfo