| Index: content/child/child_thread_impl.cc
|
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
|
| index 6d6227f0e0d173efc23fee301617ac800ddf20ca..458604f431af855cc781862bbec924b85e2ad701 100644
|
| --- a/content/child/child_thread_impl.cc
|
| +++ b/content/child/child_thread_impl.cc
|
| @@ -414,7 +414,7 @@
|
| g_lazy_tls.Pointer()->Set(this);
|
| on_channel_error_called_ = false;
|
| message_loop_ = base::MessageLoop::current();
|
| -#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
|
| +#ifdef IPC_MESSAGE_LOG_ENABLED
|
| // We must make sure to instantiate the IPC Logger *before* we create the
|
| // channel, otherwise we can get a callback on the IO thread which creates
|
| // the logger, and the logger does not like being created on the IO thread.
|
| @@ -424,7 +424,7 @@
|
| channel_ =
|
| IPC::SyncChannel::Create(this, ChildProcess::current()->io_task_runner(),
|
| ChildProcess::current()->GetShutDownEvent());
|
| -#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
|
| +#ifdef IPC_MESSAGE_LOG_ENABLED
|
| if (!IsInBrowserProcess())
|
| IPC::Logging::GetInstance()->SetIPCSender(this);
|
| #endif
|
| @@ -572,7 +572,7 @@
|
| }
|
|
|
| ChildThreadImpl::~ChildThreadImpl() {
|
| -#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
|
| +#ifdef IPC_MESSAGE_LOG_ENABLED
|
| IPC::Logging::GetInstance()->SetIPCSender(NULL);
|
| #endif
|
|
|
| @@ -727,7 +727,7 @@
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(ChildThreadImpl, msg)
|
| IPC_MESSAGE_HANDLER(ChildProcessMsg_Shutdown, OnShutdown)
|
| -#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
|
| +#if defined(IPC_MESSAGE_LOG_ENABLED)
|
| IPC_MESSAGE_HANDLER(ChildProcessMsg_SetIPCLoggingEnabled,
|
| OnSetIPCLoggingEnabled)
|
| #endif
|
| @@ -798,7 +798,7 @@
|
| base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| -#if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
|
| +#if defined(IPC_MESSAGE_LOG_ENABLED)
|
| void ChildThreadImpl::OnSetIPCLoggingEnabled(bool enable) {
|
| if (enable)
|
| IPC::Logging::GetInstance()->Enable();
|
|
|