Revert "Move mojo edk into mojo/edk"

mojo/system/message_pipe_test_utils.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 MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#ifndef MOJO_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#define MOJO_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
 
 #include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/common/test/multiprocess_test_helper.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/test_utils.h"
 
 namespace mojo {
 namespace system {
 
 class Channel;
 class ChannelEndpoint;
 class MessagePipe;
 
 namespace test {
 
@@ skipping 40 matching lines @@
   mojo::test::MultiprocessTestHelper helper_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiprocessMessagePipeTestBase);
 };
 #endif
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#endif  // MOJO_SYSTEM_MESSAGE_PIPE_TEST_HELPER_H_