Update from https://crrev.com/328418

mojo/tests/task_tracker_perftest.cc

 // Copyright 2015 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.
 
 #include <numeric>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/tracked_objects.h"
@@ skipping 48 matching lines @@
   RequestResponsePerfTest()
       : loop_(make_scoped_ptr(new common::MessagePumpMojo())) {}
 
   ~RequestResponsePerfTest() override { loop_.RunUntilIdle(); }
 
   void Iterate(size_t count);
   void Measure(const char* case_nam);
 
   void SetUp() override {
     tracked_objects::ThreadData::InitializeAndSetTrackingStatus(
-        tracked_objects::ThreadData::PROFILING_CHILDREN_ACTIVE);
+        tracked_objects::ThreadData::PROFILING_ACTIVE);
   }
 
   void TearDown() override {
     tracked_objects::ThreadData::InitializeAndSetTrackingStatus(
         tracked_objects::ThreadData::DEACTIVATED);
   }
 
   void PumpMessages() { loop_.RunUntilIdle(); }
 
  private:
@@ skipping 45 matching lines @@
   Environment::GetDefaultTaskTracker()->SetEnabled(false);
 }
 
 TEST_F(RequestResponsePerfTest, TrackingDisabled) {
   Measure(__FUNCTION__);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo