Fold //ipc/mojo into //ipc.

ipc/ipc_mojo_param_traits.h

Index: ipc/ipc_mojo_param_traits.h
diff --git a/ipc/mojo/ipc_mojo_param_traits.h b/ipc/ipc_mojo_param_traits.h
similarity index 77%
rename from ipc/mojo/ipc_mojo_param_traits.h
rename to ipc/ipc_mojo_param_traits.h
index f0b8b515b6fbe8dabae1d86c065fb95dca580fac..a474f7b1df9a9dbb5ef5882a47d96aae1e9f7dd8 100644
--- a/ipc/mojo/ipc_mojo_param_traits.h
+++ b/ipc/ipc_mojo_param_traits.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_PARAM_TRAITS_H_
-#define IPC_MOJO_IPC_MOJO_PARAM_TRAITS_H_
+#ifndef IPC_IPC_MOJO_PARAM_TRAITS_H_
+#define IPC_IPC_MOJO_PARAM_TRAITS_H_
 
 #include <string>
 
@@ -20,7 +20,7 @@ namespace IPC {
 class Message;
 
 template <>
-struct IPC_MOJO_EXPORT ParamTraits<mojo::MessagePipeHandle> {
+struct IPC_EXPORT ParamTraits<mojo::MessagePipeHandle> {
   typedef mojo::MessagePipeHandle param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
@@ -29,4 +29,4 @@ struct IPC_MOJO_EXPORT ParamTraits<mojo::MessagePipeHandle> {
 
 }  // namespace IPC
 
-#endif  // IPC_MOJO_IPC_MOJO_PARAM_TRAITS_H_
+#endif  // IPC_IPC_MOJO_PARAM_TRAITS_H_