Fold //ipc/mojo into //ipc.

ipc/ipc_mojo_bootstrap.h

 // 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.
 
-#ifndef IPC_MOJO_IPC_MOJO_BOOTSTRAP_H_
-#define IPC_MOJO_IPC_MOJO_BOOTSTRAP_H_
+#ifndef IPC_IPC_MOJO_BOOTSTRAP_H_
+#define IPC_IPC_MOJO_BOOTSTRAP_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
+#include "ipc/ipc.mojom.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_listener.h"
-#include "ipc/mojo/ipc.mojom.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 namespace IPC {
 
 // MojoBootstrap establishes a pair of associated interfaces between two
 // processes in Chrome.
 //
 // Clients should implement MojoBootstrap::Delegate to get the associated pipes
 // from MojoBootstrap object.
 //
 // This lives on IO thread other than Create(), which can be called from
 // UI thread as Channel::Create() can be.
-class IPC_MOJO_EXPORT MojoBootstrap {
+class IPC_EXPORT MojoBootstrap {
  public:
   class Delegate {
    public:
     virtual void OnPipesAvailable(
         mojom::ChannelAssociatedPtrInfo send_channel,
         mojom::ChannelAssociatedRequest receive_channel,
         int32_t peer_pid) = 0;
     virtual void OnBootstrapError() = 0;
   };
 
@@ skipping 33 matching lines @@
 
   mojo::ScopedMessagePipeHandle handle_;
   Delegate* delegate_;
   State state_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoBootstrap);
 };
 
 }  // namespace IPC
 
-#endif  // IPC_MOJO_IPC_MOJO_BOOTSTRAP_H_
+#endif  // IPC_IPC_MOJO_BOOTSTRAP_H_