Reland "Add enable_ipc_logging build argument"

ipc/ipc_channel_reader.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_channel_reader.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_attachment_set.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace IPC {
 namespace internal {
 
-#ifdef IPC_MESSAGE_LOG_ENABLED
+#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
 
 namespace {
 std::string GetMessageText(const Message& message) {
   std::string name;
   Logging::GetInstance()->GetMessageText(
       message.type(), &name, &message, nullptr);
   return name;
 }
 }  // namespace
 
 #define EMIT_TRACE_EVENT(message)                                       \
   TRACE_EVENT_WITH_FLOW1(                                               \
       "ipc,toplevel", "ChannelReader::DispatchInputData",               \
       (message).flags(), TRACE_EVENT_FLAG_FLOW_IN, "name",              \
       GetMessageText(message));
 #else
 #define EMIT_TRACE_EVENT(message)                                              \
   TRACE_EVENT_WITH_FLOW2("ipc,toplevel", "ChannelReader::DispatchInputData",   \
                          (message).flags(), TRACE_EVENT_FLAG_FLOW_IN, "class", \
                          IPC_MESSAGE_ID_CLASS((message).type()), "line",       \
                          IPC_MESSAGE_ID_LINE((message).type()));
-#endif  // IPC_MESSAGE_LOG_ENABLED
+#endif  // BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
 
 ChannelReader::ChannelReader(Listener* listener)
   : listener_(listener),
     max_input_buffer_size_(Channel::kMaximumReadBufferSize) {
   memset(input_buf_, 0, sizeof(input_buf_));
 }
 
 ChannelReader::~ChannelReader() {
 }
 
@@ skipping 152 matching lines @@
   if (size <= Channel::kMaximumMessageSize) {
     return true;
   }
   input_overflow_buf_.clear();
   LOG(ERROR) << "IPC message is too big: " << size;
   return false;
 }
 
 }  // namespace internal
 }  // namespace IPC