Update from https://crrev.com/311076

base/tracked_objects.h

 // Copyright (c) 2012 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.
 
 #ifndef BASE_TRACKED_OBJECTS_H_
 #define BASE_TRACKED_OBJECTS_H_
 
 #include <map>
 #include <set>
 #include <stack>
@@ skipping 731 matching lines @@
 
   // Sum of wallclock durations of all stopwatches that were directly nested in
   // this one.
   int32 excluded_duration_ms_;
 
   // Stopwatch which was running on our thread when this stopwatch was started.
   // That preexisting stopwatch must be adjusted to the exclude the wallclock
   // duration of this stopwatch.
   TaskStopwatch* parent_;
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   // State of the stopwatch. Stopwatch is first constructed in a created state
   // state, then is optionally started/stopped, then destructed.
   enum { CREATED, RUNNING, STOPPED } state_;
 
   // Currently running stopwatch that is directly nested in this one, if such
   // stopwatch exists. NULL otherwise.
   TaskStopwatch* child_;
 #endif
 };
 
@@ skipping 21 matching lines @@
   ~ProcessDataSnapshot();
 
   std::vector<TaskSnapshot> tasks;
   std::vector<ParentChildPairSnapshot> descendants;
   int process_id;
 };
 
 }  // namespace tracked_objects
 
 #endif  // BASE_TRACKED_OBJECTS_H_