Revert "Move mojo edk into mojo/edk"

mojo/system/message_pipe_test_utils.cc

 // 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.
 
-#include "mojo/edk/system/message_pipe_test_utils.h"
+#include "mojo/system/message_pipe_test_utils.h"
 
 #include "base/bind.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {
 namespace test {
 
 MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp,
                            MojoHandleSignals signals,
                            HandleSignalsState* signals_state) {
   Waiter waiter;
   waiter.Init();
@@ skipping 83 matching lines @@
 }
 
 void MultiprocessMessagePipeTestBase::Init(scoped_refptr<ChannelEndpoint> ep) {
   channel_thread_.Start(helper_.server_platform_handle.Pass(), ep);
 }
 #endif
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo