Revert 120789 - Propogate status setting for profiler to track parents

base/profiler/tracked_time_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Test of classes in tracked_time.cc
 
 #include "base/profiler/tracked_time.h"
 #include "base/time.h"
 #include "base/tracked_objects.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 57 matching lines @@
   // Now make sure that we bracketed our tracked time nicely.
   Duration before = now - TrackedTime(ticks_before);
   EXPECT_LE(0, before.InMilliseconds());
   Duration after = now - TrackedTime(ticks_after);
   EXPECT_GE(0, after.InMilliseconds());
 }
 
 TEST(TrackedTimeTest, TrackedTimerDisabled) {
   // Check to be sure disabling the collection of data induces a null time
   // (which we know will return much faster).
-  if (!ThreadData::InitializeAndSetTrackingStatus(ThreadData::DEACTIVATED))
+  if (!ThreadData::InitializeAndSetTrackingStatus(false))
     return;
   // Since we disabled tracking, we should get a null response.
   TrackedTime track_now = ThreadData::Now();
   EXPECT_TRUE(track_now.is_null());
   track_now = ThreadData::NowForStartOfRun(NULL);
   EXPECT_TRUE(track_now.is_null());
   track_now = ThreadData::NowForEndOfRun();
   EXPECT_TRUE(track_now.is_null());
 }
 
 TEST(TrackedTimeTest, TrackedTimerEnabled) {
-  if (!ThreadData::InitializeAndSetTrackingStatus(
-      ThreadData::PROFILING_CHILDREN_ACTIVE))
+  if (!ThreadData::InitializeAndSetTrackingStatus(true))
     return;
   // Make sure that when we enable tracking, we get a real timer result.
 
   // First get a 64 bit timer (which should not be null).
   base::TimeTicks ticks_before = base::TimeTicks::Now();
   EXPECT_FALSE(ticks_before.is_null());
 
   // Then get a 32 bit timer that can be null when it wraps.
   // Crtical difference from  the TrackedTimerVsTimeTicks test, is that we use
   // ThreadData::Now().  It can sometimes return the null time.
   TrackedTime now = ThreadData::Now();
 
   // Then get a bracketing time.
   base::TimeTicks ticks_after = base::TimeTicks::Now();
   EXPECT_FALSE(ticks_after.is_null());
 
   // Now make sure that we bracketed our tracked time nicely.
   Duration before = now - TrackedTime(ticks_before);
   EXPECT_LE(0, before.InMilliseconds());
   Duration after = now - TrackedTime(ticks_after);
   EXPECT_GE(0, after.InMilliseconds());
 }
 
 }  // namespace tracked_objects