| Index: chrome/common/ipc_channel_proxy.cc
|
| diff --git a/chrome/common/ipc_channel_proxy.cc b/chrome/common/ipc_channel_proxy.cc
|
| index 11fdb9ba69e2aa84c6a9c03e8b0d5c7b2ff455e0..6173135913d5080be37f48f54e082d00e18b890f 100644
|
| --- a/chrome/common/ipc_channel_proxy.cc
|
| +++ b/chrome/common/ipc_channel_proxy.cc
|
| @@ -5,19 +5,11 @@
|
| #include "base/message_loop.h"
|
| #include "base/thread.h"
|
| #include "chrome/common/ipc_channel_proxy.h"
|
| -#if defined(OS_WIN)
|
| -// TODO(playmobil): remove ifdef once ObjectWatcher is ported
|
| #include "chrome/common/ipc_logging.h"
|
| -#endif
|
| #include "chrome/common/ipc_message_utils.h"
|
|
|
| namespace IPC {
|
|
|
| -#if defined(OS_POSIX)
|
| -// TODO(playmobil): remove once ObjectWatcher is ported
|
| -#undef IPC_MESSAGE_LOG_ENABLED
|
| -#endif
|
| -
|
| //-----------------------------------------------------------------------------
|
|
|
| ChannelProxy::Context::Context(Channel::Listener* listener,
|
|
|