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

mojo/edk/system/channel.cc

 // 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.
 
 #include "mojo/edk/system/channel.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 218 matching lines @@
   // The channel should have been shut down first.
   DCHECK(!is_running_);
 }
 
 void Channel::OnReadMessage(
     const MessageInTransit::View& message_view,
     embedder::ScopedPlatformHandleVectorPtr platform_handles) {
   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());
       break;
     default:
       HandleRemoteError(
           base::StringPrintf("Received message of invalid type %u",
                              static_cast<unsigned>(message_view.type())));
       break;
   }
@@ skipping 23 matching lines @@
       break;
     case ERROR_WRITE:
       // Write errors are slightly notable: they probably shouldn't happen under
       // normal operation (but maybe the other side crashed).
       LOG(WARNING) << "RawChannel write error";
       break;
   }
   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()) {
     HandleRemoteError("Received message with no destination ID");
     return;
   }
 
   scoped_refptr<ChannelEndpoint> endpoint;
   {
     base::AutoLock locker(lock_);
@@ skipping 226 matching lines @@
   // TODO(vtl): Is this how we really want to handle this?
   // Sometimes we'll want to propagate the error back to the message pipe
   // (endpoint), and notify it that the remote is (effectively) closed.
   // Sometimes we'll want to kill the channel (and notify all the endpoints that
   // their remotes are dead.
   LOG(WARNING) << error_message;
 }
 
 }  // namespace system
 }  // namespace mojo