Revert of ipc: Add a member to IPC::Message::Header on Windows.

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 "base/atomic_sequence_num.h"
 #include "base/logging.h"
@@ skipping 31 matching lines @@
 namespace IPC {
 
 //------------------------------------------------------------------------------
 
 Message::~Message() {
 }
 
 Message::Message() : base::Pickle(sizeof(Header)) {
   header()->routing = header()->type = 0;
   header()->flags = GetRefNumUpper24();
-#if USE_ATTACHMENT_BROKER
+#if defined(OS_MACOSX)
   header()->num_brokered_attachments = 0;
 #endif
 #if defined(OS_POSIX)
   header()->num_fds = 0;
   header()->pad = 0;
 #endif
   Init();
 }
 
 Message::Message(int32_t routing_id, uint32_t type, PriorityValue priority)
     : base::Pickle(sizeof(Header)) {
   header()->routing = routing_id;
   header()->type = type;
   DCHECK((priority & 0xffffff00) == 0);
   header()->flags = priority | GetRefNumUpper24();
-#if USE_ATTACHMENT_BROKER
+#if defined(OS_MACOSX)
   header()->num_brokered_attachments = 0;
 #endif
 #if defined(OS_POSIX)
   header()->num_fds = 0;
   header()->pad = 0;
 #endif
   Init();
 }
 
 Message::Message(const char* data, int data_len)
@@ skipping 186 matching lines @@
 bool Message::HasMojoHandles() const {
   return attachment_set_.get() && attachment_set_->num_mojo_handles() > 0;
 }
 
 bool Message::HasBrokerableAttachments() const {
   return attachment_set_.get() &&
          attachment_set_->num_brokerable_attachments() > 0;
 }
 
 }  // namespace IPC