Backed out changeset 8ee308c30146 (bug 1161166) for debug osx mochitest failures a=merge

--HG--
extra : source : b8461156432be7a1f3daedf3b513d91a2744304a

ipc/chromium/src/chrome/common/mach_ipc_mac.h

@@ -10,6 +10,8 @@
 #include <servers/bootstrap.h>
 #include <sys/types.h>
 
+#include <CoreServices/CoreServices.h>
+
 #include "base/basictypes.h"
 
 //==============================================================================
@@ -143,12 +145,16 @@ class MachMessage {
     return GetDataLength() > 0 ? GetDataPacket()->data : NULL;
   }
 
-  u_int32_t GetDataLength();
+  u_int32_t GetDataLength() {
+    return EndianU32_LtoN(GetDataPacket()->data_length);
+  }
 
   // The message ID may be used as a code identifying the type of message
-  void SetMessageID(int32_t message_id);
+  void SetMessageID(int32_t message_id) {
+    GetDataPacket()->id = EndianU32_NtoL(message_id);
+  }
 
-  int32_t GetMessageID();
+  int32_t GetMessageID() { return EndianU32_LtoN(GetDataPacket()->id); }
 
   // Adds a descriptor (typically a mach port) to be translated
   // returns true if successful, otherwise not enough space

ipc/chromium/src/chrome/common/mach_ipc_mac.mm

@@ -59,21 +59,6 @@ MachMessage::~MachMessage() {
   }
 }
 
-
-u_int32_t MachMessage::GetDataLength() {
-  return EndianU32_LtoN(GetDataPacket()->data_length);
-}
-
-  // The message ID may be used as a code identifying the type of message
-void MachMessage::SetMessageID(int32_t message_id) {
-  GetDataPacket()->id = EndianU32_NtoL(message_id);
-}
-
-int32_t MachMessage::GetMessageID() {
-  return EndianU32_LtoN(GetDataPacket()->id);
-}
-
-
 //==============================================================================
 // returns true if successful
 bool MachMessage::SetData(const void* data,