Fold //ipc/mojo into //ipc.

ipc/ipc_mojo_handle_attachment.h

Index: ipc/ipc_mojo_handle_attachment.h
diff --git a/ipc/mojo/ipc_mojo_handle_attachment.h b/ipc/ipc_mojo_handle_attachment.h
similarity index 83%
rename from ipc/mojo/ipc_mojo_handle_attachment.h
rename to ipc/ipc_mojo_handle_attachment.h
index 31d0107274ef3764756be157fee0de9ff234411a..6aa1888c02d49c2490d3ab835afea47d3d171cd7 100644
--- a/ipc/mojo/ipc_mojo_handle_attachment.h
+++ b/ipc/ipc_mojo_handle_attachment.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IPC_MOJO_IPC_MOJO_HANDLE_ATTACHMENT_H_
-#define IPC_MOJO_IPC_MOJO_HANDLE_ATTACHMENT_H_
+#ifndef IPC_IPC_MOJO_HANDLE_ATTACHMENT_H_
+#define IPC_IPC_MOJO_HANDLE_ATTACHMENT_H_
 
 #include "base/files/file.h"
 #include "base/macros.h"
@@ -20,7 +20,7 @@ namespace internal {
 // This can hold any type of transferrable Mojo handle (i.e. message pipe, data
 // pipe, etc), but the receiver is expected to know what type of handle to
 // expect.
-class IPC_MOJO_EXPORT MojoHandleAttachment : public MessageAttachment {
+class IPC_EXPORT MojoHandleAttachment : public MessageAttachment {
  public:
   explicit MojoHandleAttachment(mojo::ScopedHandle handle);
 
@@ -44,4 +44,4 @@ class IPC_MOJO_EXPORT MojoHandleAttachment : public MessageAttachment {
 }  // namespace internal
 }  // namespace IPC
 
-#endif  // IPC_MOJO_IPC_MOJO_HANDLE_ATTACHMENT_H_
+#endif  // IPC_IPC_MOJO_HANDLE_ATTACHMENT_H_