Remove MessageInTransit::kTypeMessagePipe; rename kTypeMessagePipeEndpoint to kTypeEndpoint; etc.

mojo/edk/system/message_in_transit.h

Index: mojo/edk/system/message_in_transit.h
diff --git a/mojo/edk/system/message_in_transit.h b/mojo/edk/system/message_in_transit.h
index 2b9da6d0822bf7bdc4ac830c18077e568efb874b..0f92b0550d58e6a47de415664db7f45f50d73bc0 100644
--- a/mojo/edk/system/message_in_transit.h
+++ b/mojo/edk/system/message_in_transit.h
@@ -44,20 +44,16 @@ class TransportData;
 class MOJO_SYSTEM_IMPL_EXPORT MessageInTransit {
  public:
   typedef uint16_t Type;
-  // Messages that are forwarded to |MessagePipeEndpoint|s.
-  static const Type kTypeMessagePipeEndpoint = 0;
-  // Messages that are forwarded to |MessagePipe|s.
-  static const Type kTypeMessagePipe = 1;
+  // Messages that are forwarded to endpoints.
+  static const Type kTypeEndpoint = 0;
   // Messages that are consumed by the |Channel|.
-  static const Type kTypeChannel = 2;
+  static const Type kTypeChannel = 1;
   // Messages that are consumed by the |RawChannel| (implementation).
-  static const Type kTypeRawChannel = 3;
+  static const Type kTypeRawChannel = 2;
 
   typedef uint16_t Subtype;
-  // Subtypes for type |kTypeMessagePipeEndpoint|:
-  static const Subtype kSubtypeMessagePipeEndpointData = 0;
-  // Subtypes for type |kTypeMessagePipe|:
-  // Nothing currently.
+  // Subtypes for type |kTypeEndpoint|:
+  static const Subtype kSubtypeEndpointData = 0;
   // Subtypes for type |kTypeChannel|:
   static const Subtype kSubtypeChannelAttachAndRunEndpoint = 0;
   static const Subtype kSubtypeChannelRemoveMessagePipeEndpoint = 1;