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

mojo/edk/system/message_in_transit.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_H_
 #define MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 26 matching lines @@
 // internal detail of this class) followed immediately by the message data
 // (accessed by |bytes()| and of size |num_bytes()|, and also
 // |kMessageAlignment|-byte aligned), and then any padding needed to make the
 // main buffer a multiple of |kMessageAlignment| bytes in size.
 //
 // See |TransportData| for a description of the (serialized) transport data
 // buffer.
 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;
   static const Subtype kSubtypeChannelRemoveMessagePipeEndpointAck = 2;
 
   // Subtypes for type |kTypeRawChannel|:
   static const Subtype kSubtypeRawChannelPosixExtraPlatformHandles = 0;
 
   // Messages (the header and data) must always be aligned to a multiple of this
   // quantity (which must be a power of 2).
@@ skipping 189 matching lines @@
   // some reason.)
   scoped_ptr<DispatcherVector> dispatchers_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageInTransit);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_H_