Revert "Move mojo edk into mojo/edk"

mojo/system/raw_channel_unittest.cc

Index: mojo/system/raw_channel_unittest.cc
diff --git a/mojo/edk/system/raw_channel_unittest.cc b/mojo/system/raw_channel_unittest.cc
similarity index 98%
rename from mojo/edk/system/raw_channel_unittest.cc
rename to mojo/system/raw_channel_unittest.cc
index 7531cf3a005f6c068080b59eef410bff9c301a09..c198257606acd1b6e0540d10c46f74111bbe6834 100644
--- a/mojo/edk/system/raw_channel_unittest.cc
+++ b/mojo/system/raw_channel_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/edk/system/raw_channel.h"
+#include "mojo/system/raw_channel.h"
 
 #include <stdint.h>
 
@@ -22,12 +22,12 @@
 #include "base/threading/simple_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {