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

mojo/edk/system/channel.cc

Index: mojo/edk/system/channel.cc
diff --git a/mojo/edk/system/channel.cc b/mojo/edk/system/channel.cc
index d678d0e83cdb7bdbf0787129e35dafcdc3890a03..92eb8b015076b82e0ea2b4bf34d5dca55468a575 100644
--- a/mojo/edk/system/channel.cc
+++ b/mojo/edk/system/channel.cc
@@ -236,9 +236,8 @@ void Channel::OnReadMessage(
   DCHECK(creation_thread_checker_.CalledOnValidThread());
 
   switch (message_view.type()) {
-    case MessageInTransit::kTypeMessagePipeEndpoint:
-    case MessageInTransit::kTypeMessagePipe:
-      OnReadMessageForDownstream(message_view, platform_handles.Pass());
+    case MessageInTransit::kTypeEndpoint:
+      OnReadMessageForEndpoint(message_view, platform_handles.Pass());
       break;
     case MessageInTransit::kTypeChannel:
       OnReadMessageForChannel(message_view, platform_handles.Pass());
@@ -282,12 +281,11 @@ void Channel::OnError(Error error) {
   Shutdown();
 }
 
-void Channel::OnReadMessageForDownstream(
+void Channel::OnReadMessageForEndpoint(
     const MessageInTransit::View& message_view,
     embedder::ScopedPlatformHandleVectorPtr platform_handles) {
   DCHECK(creation_thread_checker_.CalledOnValidThread());
-  DCHECK(message_view.type() == MessageInTransit::kTypeMessagePipeEndpoint ||
-         message_view.type() == MessageInTransit::kTypeMessagePipe);
+  DCHECK(message_view.type() == MessageInTransit::kTypeEndpoint);
 
   ChannelEndpointId local_id = message_view.destination_id();
   if (!local_id.is_valid()) {