Fold //ipc/mojo into //ipc.

ipc/ipc_mojo_message_helper.h

Index: ipc/ipc_mojo_message_helper.h
diff --git a/ipc/mojo/ipc_mojo_message_helper.h b/ipc/ipc_mojo_message_helper.h
similarity index 80%
rename from ipc/mojo/ipc_mojo_message_helper.h
rename to ipc/ipc_mojo_message_helper.h
index e0e44d075d00193d4db267266d4c1d716fcf9b37..4a71b5c96cd4c53332a5be17586c305e02f362d5 100644
--- a/ipc/mojo/ipc_mojo_message_helper.h
+++ b/ipc/ipc_mojo_message_helper.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_MESSAGE_HELPER_H_
-#define IPC_MOJO_IPC_MOJO_MESSAGE_HELPER_H_
+#ifndef IPC_IPC_MOJO_MESSAGE_HELPER_H_
+#define IPC_IPC_MOJO_MESSAGE_HELPER_H_
 
 #include "ipc/ipc_export.h"
 #include "ipc/ipc_message.h"
@@ -12,7 +12,7 @@
 namespace IPC {
 
 // Reads and writes |mojo::MessagePipe| from/to |Message|.
-class IPC_MOJO_EXPORT MojoMessageHelper {
+class IPC_EXPORT MojoMessageHelper {
  public:
   static bool WriteMessagePipeTo(base::Pickle* message,
                                  mojo::ScopedMessagePipeHandle handle);
@@ -26,4 +26,4 @@ class IPC_MOJO_EXPORT MojoMessageHelper {
 
 }  // namespace IPC
 
-#endif  // IPC_MOJO_IPC_MOJO_MESSAGE_HELPER_H_
+#endif  // IPC_IPC_MOJO_MESSAGE_HELPER_H_