Fold //ipc/mojo into //ipc.

content/test/render_thread_impl_browser_test_ipc_helper.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 CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_
 #define CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_
 
 #include "content/app/mojo/mojo_init.h"
 #include "content/browser/mojo/mojo_application_host.h"
+#include "ipc/ipc_channel_mojo.h"
 #include "ipc/ipc_channel_proxy.h"
-#include "ipc/mojo/ipc_channel_mojo.h"
 #include "mojo/edk/test/scoped_ipc_support.h"
 
 namespace IPC {
 class ChannelProxy;
 class Sender;
 };
 
 namespace content {
 
 // Helper for RenderThreadImplBrowserTest which takes care of setting up an IPC
@@ skipping 32 matching lines @@
   std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support_;
   std::unique_ptr<MojoApplicationHost> mojo_application_host_;
   std::string mojo_ipc_token_;
   std::string mojo_application_token_;
   std::string channel_id_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_