Revert "Move mojo edk into mojo/edk"

mojo/system/core_test_base.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_test_base.h"
+#include "mojo/system/core_test_base.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/core.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/memory.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/core.h"
+#include "mojo/system/dispatcher.h"
+#include "mojo/system/memory.h"
 
 namespace mojo {
 namespace system {
 namespace test {
 
 namespace {
 
 // MockDispatcher --------------------------------------------------------------
 
 class MockDispatcher : public Dispatcher {
@@ skipping 320 matching lines @@
 }
 
 void CoreTestBase_MockHandleInfo::IncrementCancelAllWaitersCallCount() {
   base::AutoLock locker(lock_);
   cancel_all_waiters_call_count_++;
 }
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo