Fold //ipc/mojo into //ipc.

ipc/ipc_channel_mojo.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_IPC_CHANNEL_MOJO_H_
 #define IPC_IPC_CHANNEL_MOJO_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/task_runner.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_factory.h"
 #include "ipc/ipc_export.h"
-#include "ipc/mojo/ipc_message_pipe_reader.h"
-#include "ipc/mojo/ipc_mojo_bootstrap.h"
+#include "ipc/ipc_message_pipe_reader.h"
+#include "ipc/ipc_mojo_bootstrap.h"
 #include "mojo/public/cpp/system/core.h"
 
 namespace IPC {
 
 // Mojo-based IPC::Channel implementation over a Mojo message pipe.
 //
 // ChannelMojo builds a Mojo MessagePipe using the provided message pipe
 // |handle| and builds an associated interface for each direction on the
 // channel.
 //
 // TODO(morrita): Add APIs to create extra MessagePipes to let
 //                Mojo-based objects talk over this Channel.
 //
-class IPC_MOJO_EXPORT ChannelMojo
+class IPC_EXPORT ChannelMojo
     : public Channel,
       public MojoBootstrap::Delegate,
       public NON_EXPORTED_BASE(internal::MessagePipeReader::Delegate) {
  public:
   // Creates a ChannelMojo.
   static std::unique_ptr<ChannelMojo>
   Create(mojo::ScopedMessagePipeHandle handle, Mode mode, Listener* listener);
 
   // Create a factory object for ChannelMojo.
   // The factory is used to create Mojo-based ChannelProxy family.
@@ skipping 66 matching lines @@
   bool waiting_connect_;
 
   base::WeakPtrFactory<ChannelMojo> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_MOJO_H_