Revert "Move mojo edk into mojo/edk"

mojo/system/waiter_test_utils.h

 // Copyright 2013 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_WAITER_TEST_UTILS_H_
-#define MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_
+#ifndef MOJO_SYSTEM_WAITER_TEST_UTILS_H_
+#define MOJO_SYSTEM_WAITER_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/waiter.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {
 namespace test {
 
 // This is a very simple thread that has a |Waiter|, on which it waits
 // indefinitely (and records the result). It will create and initialize the
 // |Waiter| on creation, but the caller must start the thread with |Start()|. It
 // will join the thread on destruction.
 //
@@ skipping 67 matching lines @@
 
   Waiter waiter_;
 
   DISALLOW_COPY_AND_ASSIGN(WaiterThread);
 };
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_
+#endif  // MOJO_SYSTEM_WAITER_TEST_UTILS_H_