Reland "Add enable_ipc_logging build argument"

chrome/service/service_ipc_server.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 "chrome/service/service_ipc_server.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram_delta_serialization.h"
 #include "build/build_config.h"
 #include "chrome/common/service_messages.h"
 #include "ipc/ipc_channel_mojo.h"
 #include "ipc/ipc_logging.h"
 
 ServiceIPCServer::ServiceIPCServer(
     Client* client,
     const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
     base::WaitableEvent* shutdown_event)
     : client_(client),
       io_task_runner_(io_task_runner),
       shutdown_event_(shutdown_event) {
   DCHECK(client);
   DCHECK(shutdown_event);
 }
 
 bool ServiceIPCServer::Init() {
-#ifdef IPC_MESSAGE_LOG_ENABLED
+#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
   IPC::Logging::GetInstance()->SetIPCSender(this);
 #endif
   CreateChannel();
   return true;
 }
 
 void ServiceIPCServer::CreateChannel() {
   channel_.reset();  // Tear down the existing channel, if any.
   channel_ = IPC::SyncChannel::Create(
       IPC::ChannelMojo::CreateServerFactory(client_->CreateChannelMessagePipe(),
                                             io_task_runner_),
       this /* listener */, io_task_runner_, true /* create_pipe_now */,
       shutdown_event_);
 }
 
 ServiceIPCServer::~ServiceIPCServer() {
-#ifdef IPC_MESSAGE_LOG_ENABLED
+#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
   IPC::Logging::GetInstance()->SetIPCSender(NULL);
 #endif
 }
 
 void ServiceIPCServer::OnChannelConnected(int32_t peer_pid) {
   DCHECK(!ipc_client_connected_);
   ipc_client_connected_ = true;
 }
 
 void ServiceIPCServer::OnChannelError() {
@@ skipping 65 matching lines @@
   channel_->Send(new ServiceHostMsg_Histograms(deltas));
 }
 
 void ServiceIPCServer::OnShutdown() {
   client_->OnShutdown();
 }
 
 void ServiceIPCServer::OnUpdateAvailable() {
   client_->OnUpdateAvailable();
 }