Revert "Move mojo edk into mojo/edk"

mojo/system/message_in_transit_queue.h

Index: mojo/system/message_in_transit_queue.h
diff --git a/mojo/edk/system/message_in_transit_queue.h b/mojo/system/message_in_transit_queue.h
similarity index 84%
rename from mojo/edk/system/message_in_transit_queue.h
rename to mojo/system/message_in_transit_queue.h
index d81bd2b40b3da73c197a16b594bcd2e865d795a1..a32f424bc93399c668e8ae8bbc6eac8da2a31c40 100644
--- a/mojo/edk/system/message_in_transit_queue.h
+++ b/mojo/system/message_in_transit_queue.h
@@ -2,15 +2,15 @@
 // 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_IN_TRANSIT_QUEUE_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
+#ifndef MOJO_SYSTEM_MESSAGE_QUEUE_H_
+#define MOJO_SYSTEM_MESSAGE_QUEUE_H_
 
 #include <deque>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -58,4 +58,4 @@ class MOJO_SYSTEM_IMPL_EXPORT MessageInTransitQueue {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
+#endif  // MOJO_SYSTEM_MESSAGE_QUEUE_H_