Revert "Move mojo edk into mojo/edk"

mojo/system/core_unittest.cc

 // Copyright 2013 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/core.h"
+#include "mojo/system/core.h"
 
 #include <stdint.h>
 
 #include <limits>
 
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
-#include "mojo/edk/system/core_test_base.h"
+#include "mojo/system/core_test_base.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 const MojoHandleSignalsState kEmptyMojoHandleSignalsState = {0u, 0u};
 const MojoHandleSignalsState kFullMojoHandleSignalsState = {~0u, ~0u};
 
 typedef test::CoreTestBase CoreTest;
 
@@ skipping 1453 matching lines @@
   EXPECT_EQ(MOJO_RESULT_OK, core()->Close(h_passing[1]));
   EXPECT_EQ(MOJO_RESULT_OK, core()->Close(ph));
   EXPECT_EQ(MOJO_RESULT_OK, core()->Close(ch));
 }
 
 // TODO(vtl): Test |DuplicateBufferHandle()| and |MapBuffer()|.
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo