Revert "Move mojo edk into mojo/edk"

mojo/common/test/test_utils.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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>
 
 #include <string>
 
 #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 {
 
 // On success, |bytes_written| is updated to the number of bytes written;
 // otherwise it is untouched.
 bool BlockingWrite(const embedder::PlatformHandle& handle,
                    const void* buffer,
                    size_t bytes_to_write,
                    size_t* bytes_written);
@@ skipping 20 matching lines @@
 // Gets a (scoped) |FILE| from a (scoped) |PlatformHandle|.
 base::ScopedFILE FILEFromPlatformHandle(embedder::ScopedPlatformHandle h,
                                         const char* mode);
 
 // Returns the path to the mojom js bindings file.
 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_