Update from https://crrev.com/311076

mojo/edk/system/transport_data.cc

 // Copyright 2014 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 "mojo/edk/system/transport_data.h"
 
 #include <string.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 60 matching lines @@
 
   // The offset to the start of the (Mojo) handle table.
   const size_t handle_table_start_offset = sizeof(Header);
   // The offset to the start of the serialized dispatcher data.
   const size_t serialized_dispatcher_start_offset =
       handle_table_start_offset + num_handles * sizeof(HandleTableEntry);
   // The estimated size of the secondary buffer. We compute this estimate below.
   // It must be at least as big as the (eventual) actual size.
   size_t estimated_size = serialized_dispatcher_start_offset;
   size_t estimated_num_platform_handles = 0;
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   std::vector<size_t> all_max_sizes(num_handles);
   std::vector<size_t> all_max_platform_handles(num_handles);
 #endif
   for (size_t i = 0; i < num_handles; i++) {
     if (Dispatcher* dispatcher = (*dispatchers)[i].get()) {
       size_t max_size = 0;
       size_t max_platform_handles = 0;
       Dispatcher::TransportDataAccess::StartSerialize(
           dispatcher, channel, &max_size, &max_platform_handles);
 
       DCHECK_LE(max_size, kMaxSerializedDispatcherSize);
       estimated_size += MessageInTransit::RoundUpMessageAlignment(max_size);
       DCHECK_LE(estimated_size, GetMaxBufferSize());
 
       DCHECK_LE(max_platform_handles, kMaxSerializedDispatcherPlatformHandles);
       estimated_num_platform_handles += max_platform_handles;
       DCHECK_LE(estimated_num_platform_handles, GetMaxPlatformHandles());
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
       all_max_sizes[i] = max_size;
       all_max_platform_handles[i] = max_platform_handles;
 #endif
     }
   }
 
   size_t size_per_platform_handle = 0;
   if (estimated_num_platform_handles > 0) {
     size_per_platform_handle = channel->GetSerializedPlatformHandleSize();
     DCHECK_LE(size_per_platform_handle, kMaxSizePerPlatformHandle);
@@ skipping 23 matching lines @@
       buffer_.get() + handle_table_start_offset);
   size_t current_offset = serialized_dispatcher_start_offset;
   for (size_t i = 0; i < num_handles; i++) {
     Dispatcher* dispatcher = (*dispatchers)[i].get();
     if (!dispatcher) {
       static_assert(Dispatcher::kTypeUnknown == 0,
                     "Value of Dispatcher::kTypeUnknown must be 0");
       continue;
     }
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
     size_t old_platform_handles_size =
         platform_handles_ ? platform_handles_->size() : 0;
 #endif
 
     void* destination = buffer_.get() + current_offset;
     size_t actual_size = 0;
     if (Dispatcher::TransportDataAccess::EndSerializeAndClose(
             dispatcher, channel, destination, &actual_size,
             platform_handles_.get())) {
       handle_table[i].type = static_cast<int32_t>(dispatcher->GetType());
       handle_table[i].offset = static_cast<uint32_t>(current_offset);
       handle_table[i].size = static_cast<uint32_t>(actual_size);
 // (Okay to not set |unused| since we cleared the entire buffer.)
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
       DCHECK_LE(actual_size, all_max_sizes[i]);
       DCHECK_LE(platform_handles_
                     ? (platform_handles_->size() - old_platform_handles_size)
                     : 0,
                 all_max_platform_handles[i]);
 #endif
     } else {
       // Nothing to do on failure, since |buffer_| was cleared, and
       // |kTypeUnknown| is zero. The handle was simply closed.
       LOG(ERROR) << "Failed to serialize handle to remote message pipe";
@@ skipping 165 matching lines @@
     const void* source = static_cast<const char*>(buffer) + offset;
     (*dispatchers)[i] = Dispatcher::TransportDataAccess::Deserialize(
         channel, handle_table[i].type, source, size, platform_handles.get());
   }
 
   return dispatchers.Pass();
 }
 
 }  // namespace system
 }  // namespace mojo