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

mojo/edk/system/raw_channel_unittest.cc

 // Copyright 2014 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/raw_channel.h"
 
 #include <stdint.h>
 
 #include <vector>
 
@@ skipping 20 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 scoped_ptr<MessageInTransit> MakeTestMessage(uint32_t num_bytes) {
   std::vector<unsigned char> bytes(num_bytes, 0);
   for (size_t i = 0; i < num_bytes; i++)
     bytes[i] = static_cast<unsigned char>(i + num_bytes);
-  return make_scoped_ptr(
-      new MessageInTransit(MessageInTransit::kTypeMessagePipeEndpoint,
-                           MessageInTransit::kSubtypeMessagePipeEndpointData,
-                           num_bytes, bytes.empty() ? nullptr : &bytes[0]));
+  return make_scoped_ptr(new MessageInTransit(
+      MessageInTransit::kTypeEndpoint, MessageInTransit::kSubtypeEndpointData,
+      num_bytes, bytes.empty() ? nullptr : &bytes[0]));
 }
 
 bool CheckMessageData(const void* bytes, uint32_t num_bytes) {
   const unsigned char* b = static_cast<const unsigned char*>(bytes);
   for (uint32_t i = 0; i < num_bytes; i++) {
     if (b[i] != static_cast<unsigned char>(i + num_bytes))
       return false;
   }
   return true;
 }
@@ skipping 620 matching lines @@
 
   EXPECT_FALSE(rc->WriteMessage(MakeTestMessage(1)));
 
   // Wait for the delegate, which will shut the |RawChannel| down.
   delegate.Wait();
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo