Revert "Move mojo edk into mojo/edk"

mojo/system/transport_data.h

Index: mojo/system/transport_data.h
diff --git a/mojo/edk/system/transport_data.h b/mojo/system/transport_data.h
similarity index 96%
rename from mojo/edk/system/transport_data.h
rename to mojo/system/transport_data.h
index 395bc737307a3abdb6b6e1c0d34a906ade45dc1b..b74623cef8ad1f520bc62217deadc3ca93423ac3 100644
--- a/mojo/edk/system/transport_data.h
+++ b/mojo/system/transport_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
-#define MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
+#ifndef MOJO_SYSTEM_TRANSPORT_DATA_H_
+#define MOJO_SYSTEM_TRANSPORT_DATA_H_
 
 #include <stdint.h>
 
@@ -13,10 +13,10 @@
 #include "base/memory/aligned_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
@@ -189,4 +189,4 @@ class MOJO_SYSTEM_IMPL_EXPORT TransportData {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
+#endif  // MOJO_SYSTEM_TRANSPORT_DATA_H_