Revert "Move mojo edk into mojo/edk"

mojo/system/waiter_list.cc

 // 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.
 
-#include "mojo/edk/system/waiter_list.h"
+#include "mojo/system/waiter_list.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/system/handle_signals_state.h"
+#include "mojo/system/waiter.h"
 
 namespace mojo {
 namespace system {
 
 WaiterList::WaiterList() {
 }
 
 WaiterList::~WaiterList() {
   DCHECK(waiters_.empty());
 }
@@ skipping 28 matching lines @@
   for (WaiterInfoList::iterator it = waiters_.begin(); it != waiters_.end();) {
     WaiterInfoList::iterator maybe_delete = it;
     ++it;
     if (maybe_delete->waiter == waiter)
       waiters_.erase(maybe_delete);
   }
 }
 
 }  // namespace system
 }  // namespace mojo