Revert "Move mojo edk into mojo/edk"

mojo/system/core_test_base.h

Index: mojo/system/core_test_base.h
diff --git a/mojo/edk/system/core_test_base.h b/mojo/system/core_test_base.h
similarity index 95%
rename from mojo/edk/system/core_test_base.h
rename to mojo/system/core_test_base.h
index 409f7e1bf72f87517774f4d9b7fb1c41263ad3d6..e1b52bcac73ad041eb8a6b707a3993206e6548cd 100644
--- a/mojo/edk/system/core_test_base.h
+++ b/mojo/system/core_test_base.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_CORE_TEST_BASE_H_
-#define MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_
+#ifndef MOJO_SYSTEM_CORE_TEST_BASE_H_
+#define MOJO_SYSTEM_CORE_TEST_BASE_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ -102,4 +102,4 @@ class CoreTestBase_MockHandleInfo {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_
+#endif  // MOJO_SYSTEM_CORE_TEST_BASE_H_