Revert "Move mojo edk into mojo/edk"

mojo/system/platform_handle_dispatcher_unittest.cc

 // 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.
 
-#include "mojo/edk/system/platform_handle_dispatcher.h"
+#include "mojo/system/platform_handle_dispatcher.h"
 
 #include <stdio.h>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 TEST(PlatformHandleDispatcherTest, Basic) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
@@ skipping 77 matching lines @@
   EXPECT_EQ(sizeof(kFooBar),
             fread(read_buffer, 1, sizeof(read_buffer), fp.get()));
   EXPECT_STREQ(kFooBar, read_buffer);
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo