Reland "Add enable_ipc_logging build argument"

ipc/ipc_message.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 "ipc/ipc_message.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 64 matching lines @@
   Init();
 }
 
 Message::Message(const Message& other) : base::Pickle(other) {
   Init();
   attachment_set_ = other.attachment_set_;
 }
 
 void Message::Init() {
   dispatch_error_ = false;
-#ifdef IPC_MESSAGE_LOG_ENABLED
+#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
   received_time_ = 0;
   dont_log_ = false;
   log_data_ = NULL;
 #endif
 }
 
 Message& Message::operator=(const Message& other) {
   *static_cast<base::Pickle*>(this) = other;
   attachment_set_ = other.attachment_set_;
   return *this;
 }
 
 void Message::SetHeaderValues(int32_t routing, uint32_t type, uint32_t flags) {
   // This should only be called when the message is already empty.
   DCHECK(payload_size() == 0);
 
   header()->routing = routing;
   header()->type = type;
   header()->flags = flags;
 }
 
 void Message::EnsureMessageAttachmentSet() {
   if (attachment_set_.get() == NULL)
     attachment_set_ = new MessageAttachmentSet;
 }
 
-#ifdef IPC_MESSAGE_LOG_ENABLED
+#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
 void Message::set_sent_time(int64_t time) {
   DCHECK((header()->flags & HAS_SENT_TIME_BIT) == 0);
   header()->flags |= HAS_SENT_TIME_BIT;
   WriteInt64(time);
 }
 
 int64_t Message::sent_time() const {
   if ((header()->flags & HAS_SENT_TIME_BIT) == 0)
     return 0;
 
   const char* data = end_of_payload();
   data -= sizeof(int64_t);
   return *(reinterpret_cast<const int64_t*>(data));
 }
 
 void Message::set_received_time(int64_t time) const {
   received_time_ = time;
 }
-#endif
+#endif  // BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
 
 Message::NextMessageInfo::NextMessageInfo()
     : message_size(0), message_found(false), pickle_end(nullptr),
       message_end(nullptr) {}
 Message::NextMessageInfo::~NextMessageInfo() {}
 
 // static
 void Message::FindNext(const char* range_start,
                        const char* range_end,
                        NextMessageInfo* info) {
@@ skipping 54 matching lines @@
   *attachment = attachment_set->GetAttachmentAt(index);
 
   return nullptr != attachment->get();
 }
 
 bool Message::HasAttachments() const {
   return attachment_set_.get() && !attachment_set_->empty();
 }
 
 }  // namespace IPC