Revert "Move mojo edk into mojo/edk"

mojo/common/test/multiprocess_test_helper.h

Index: mojo/common/test/multiprocess_test_helper.h
diff --git a/mojo/edk/test/multiprocess_test_helper.h b/mojo/common/test/multiprocess_test_helper.h
similarity index 93%
rename from mojo/edk/test/multiprocess_test_helper.h
rename to mojo/common/test/multiprocess_test_helper.h
index ea77544dd2a0449fab748b0bb5bbc07646e50dbd..d518b6f8a1e5d0e854a9c489eea0f30c2d552f49 100644
--- a/mojo/edk/test/multiprocess_test_helper.h
+++ b/mojo/common/test/multiprocess_test_helper.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_MULTIPROCESS_TEST_HELPER_H_
-#define MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_
+#ifndef MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_
+#define MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_
 
 #include <string>
 
@@ -12,7 +12,7 @@
 #include "base/process/process_handle.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "testing/multiprocess_func_list.h"
 
 namespace mojo {
@@ -88,4 +88,4 @@ class MultiprocessTestHelper {
 }  // namespace test
 }  // namespace mojo
 
-#endif  // MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_
+#endif  // MOJO_COMMON_TEST_MULTIPROCESS_TEST_HELPER_H_