Update from https://crrev.com/328418

mojo/common/task_tracker_unittest.cc

Index: mojo/common/task_tracker_unittest.cc
diff --git a/mojo/common/task_tracker_unittest.cc b/mojo/common/task_tracker_unittest.cc
index 77f7da821a2017f4e6f015d46fe8e016649690d5..090e58695de5375f49087dcd133f9a1905118a42 100644
--- a/mojo/common/task_tracker_unittest.cc
+++ b/mojo/common/task_tracker_unittest.cc
@@ -15,7 +15,7 @@ class TaskTrackerTest : public testing::Test {
  public:
   void SetUp() override {
     tracked_objects::ThreadData::InitializeAndSetTrackingStatus(
-        tracked_objects::ThreadData::PROFILING_CHILDREN_ACTIVE);
+        tracked_objects::ThreadData::PROFILING_ACTIVE);
   }
 
   void TearDown() override {
@@ -31,10 +31,10 @@ TEST_F(TaskTrackerTest, Nesting) {
   TaskTracker::EndTracking(id0);
 
   tracked_objects::ProcessDataSnapshot snapshot;
-  tracked_objects::ThreadData::Snapshot(&snapshot);
+  tracked_objects::ThreadData::Snapshot(0, &snapshot);
 
   // Nested one is ignored.
-  EXPECT_EQ(1U, snapshot.phased_process_data_snapshots[0].tasks.size());
+  EXPECT_EQ(1U, snapshot.phased_snapshots[0].tasks.size());
 }
 
 TEST_F(TaskTrackerTest, Twice) {
@@ -44,9 +44,9 @@ TEST_F(TaskTrackerTest, Twice) {
   TaskTracker::EndTracking(id1);
 
   tracked_objects::ProcessDataSnapshot snapshot;
-  tracked_objects::ThreadData::Snapshot(&snapshot);
+  tracked_objects::ThreadData::Snapshot(0, &snapshot);
 
-  EXPECT_EQ(2U, snapshot.phased_process_data_snapshots[0].tasks.size());
+  EXPECT_EQ(2U, snapshot.phased_snapshots[0].tasks.size());
 }
 
 }  // namespace test