Update from https://crrev.com/311076

base/tracked_objects.cc

 // 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.
 
 #include "base/tracked_objects.h"
 
 #include <limits.h>
 #include <stdlib.h>
 
 #include "base/atomicops.h"
@@ skipping 855 matching lines @@
     delete next_thread_data;  // Includes all Death Records.
   }
 }
 
 //------------------------------------------------------------------------------
 TaskStopwatch::TaskStopwatch()
     : wallclock_duration_ms_(0),
       current_thread_data_(NULL),
       excluded_duration_ms_(0),
       parent_(NULL) {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   state_ = CREATED;
   child_ = NULL;
 #endif
 }
 
 TaskStopwatch::~TaskStopwatch() {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(state_ != RUNNING);
   DCHECK(child_ == NULL);
 #endif
 }
 
 void TaskStopwatch::Start() {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(state_ == CREATED);
   state_ = RUNNING;
 #endif
 
   start_time_ = ThreadData::Now();
 
   current_thread_data_ = ThreadData::Get();
   if (!current_thread_data_)
     return;
 
   parent_ = current_thread_data_->current_stopwatch_;
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   if (parent_) {
     DCHECK(parent_->state_ == RUNNING);
     DCHECK(parent_->child_ == NULL);
     parent_->child_ = this;
   }
 #endif
   current_thread_data_->current_stopwatch_ = this;
 }
 
 void TaskStopwatch::Stop() {
   const TrackedTime end_time = ThreadData::Now();
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(state_ == RUNNING);
   state_ = STOPPED;
   DCHECK(child_ == NULL);
 #endif
 
   if (!start_time_.is_null() && !end_time.is_null()) {
     wallclock_duration_ms_ = (end_time - start_time_).InMilliseconds();
   }
 
   if (!current_thread_data_)
     return;
 
   DCHECK(current_thread_data_->current_stopwatch_ == this);
   current_thread_data_->current_stopwatch_ = parent_;
   if (!parent_)
     return;
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(parent_->state_ == RUNNING);
   DCHECK(parent_->child_ == this);
   parent_->child_ = NULL;
 #endif
   parent_->excluded_duration_ms_ += wallclock_duration_ms_;
   parent_ = NULL;
 }
 
 TrackedTime TaskStopwatch::StartTime() const {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(state_ != CREATED);
 #endif
 
   return start_time_;
 }
 
 int32 TaskStopwatch::RunDurationMs() const {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(state_ == STOPPED);
 #endif
 
   return wallclock_duration_ms_ - excluded_duration_ms_;
 }
 
 ThreadData* TaskStopwatch::GetThreadData() const {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(state_ != CREATED);
 #endif
 
   return current_thread_data_;
 }
 
 //------------------------------------------------------------------------------
 TaskSnapshot::TaskSnapshot() {
 }
 
@@ skipping 31 matching lines @@
     : process_id(base::GetCurrentProcId()) {
 #else
     : process_id(0) {
 #endif
 }
 
 ProcessDataSnapshot::~ProcessDataSnapshot() {
 }
 
 }  // namespace tracked_objects