Revert "Move mojo edk into mojo/edk"

mojo/system/waiter_list.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_LIST_H_
-#define MOJO_EDK_SYSTEM_WAITER_LIST_H_
+#ifndef MOJO_SYSTEM_WAITER_LIST_H_
+#define MOJO_SYSTEM_WAITER_LIST_H_
 
 #include <stdint.h>
 
 #include <list>
 
 #include "base/macros.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
 
 class Waiter;
 struct HandleSignalsState;
 
 // |WaiterList| tracks all the |Waiter|s that are waiting on a given
 // handle/|Dispatcher|. There should be a |WaiterList| for each handle that can
 // be waited on (in any way). In the simple case, the |WaiterList| is owned by
@@ skipping 23 matching lines @@
   typedef std::list<WaiterInfo> WaiterInfoList;
 
   WaiterInfoList waiters_;
 
   DISALLOW_COPY_AND_ASSIGN(WaiterList);
 };
 
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_WAITER_LIST_H_
+#endif  // MOJO_SYSTEM_WAITER_LIST_H_