Revert "Move mojo edk into mojo/edk"

mojo/common/test/test_utils.h

Index: mojo/common/test/test_utils.h
diff --git a/mojo/edk/test/test_utils.h b/mojo/common/test/test_utils.h
similarity index 89%
rename from mojo/edk/test/test_utils.h
rename to mojo/common/test/test_utils.h
index 9287457cd93a4a385e040cc7d12b48657aefabd8..711dfe41ab0437503a531a512f34e5d221892f1f 100644
--- a/mojo/edk/test/test_utils.h
+++ b/mojo/common/test/test_utils.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_TEST_TEST_UTILS_H_
-#define MOJO_EDK_TEST_TEST_UTILS_H_
+#ifndef MOJO_COMMON_TEST_TEST_UTILS_H_
+#define MOJO_COMMON_TEST_TEST_UTILS_H_
 
 #include <stddef.h>
 #include <stdio.h>
@@ -12,8 +12,8 @@
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 
 namespace mojo {
 namespace test {
@@ -54,4 +54,4 @@ base::FilePath GetFilePathForJSResource(const std::string& path);
 }  // namespace test
 }  // namespace mojo
 
-#endif  // MOJO_EDK_TEST_TEST_UTILS_H_
+#endif  // MOJO_COMMON_TEST_TEST_UTILS_H_