Fold //ipc/mojo into //ipc.

ipc/mojo/ipc_mojo_message_helper.cc

Index: ipc/mojo/ipc_mojo_message_helper.cc
diff --git a/ipc/mojo/ipc_mojo_message_helper.cc b/ipc/mojo/ipc_mojo_message_helper.cc
deleted file mode 100644
index ae5e83a2cdb12e54c5807b967217e83d40dfbb17..0000000000000000000000000000000000000000
--- a/ipc/mojo/ipc_mojo_message_helper.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2015 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 "ipc/mojo/ipc_mojo_message_helper.h"
-
-#include <utility>
-
-#include "ipc/mojo/ipc_mojo_handle_attachment.h"
-
-namespace IPC {
-
-// static
-bool MojoMessageHelper::WriteMessagePipeTo(
-    base::Pickle* message,
-    mojo::ScopedMessagePipeHandle handle) {
-  message->WriteAttachment(new internal::MojoHandleAttachment(
-      mojo::ScopedHandle::From(std::move(handle))));
-  return true;
-}
-
-// static
-bool MojoMessageHelper::ReadMessagePipeFrom(
-    const base::Pickle* message,
-    base::PickleIterator* iter,
-    mojo::ScopedMessagePipeHandle* handle) {
-  scoped_refptr<base::Pickle::Attachment> attachment;
-  if (!message->ReadAttachment(iter, &attachment)) {
-    LOG(ERROR) << "Failed to read attachment for message pipe.";
-    return false;
-  }
-
-  MessageAttachment::Type type =
-      static_cast<MessageAttachment*>(attachment.get())->GetType();
-  if (type != MessageAttachment::TYPE_MOJO_HANDLE) {
-    LOG(ERROR) << "Unxpected attachment type:" << type;
-    return false;
-  }
-
-  handle->reset(mojo::MessagePipeHandle(
-      static_cast<internal::MojoHandleAttachment*>(attachment.get())
-          ->TakeHandle()
-          .release()
-          .value()));
-  return true;
-}
-
-MojoMessageHelper::MojoMessageHelper() {
-}
-
-}  // namespace IPC