Revert "Move mojo edk into mojo/edk"

mojo/system/waiter_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.
 
 // NOTE(vtl): Some of these tests are inherently flaky (e.g., if run on a
 // heavily-loaded system). Sorry. |test::EpsilonTimeout()| may be increased to
 // increase tolerance and reduce observed flakiness (though doing so reduces the
 // meaningfulness of the test).
 
-#include "mojo/edk/system/waiter.h"
+#include "mojo/system/waiter.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/threading/simple_thread.h"
 #include "base/time/time.h"
-#include "mojo/edk/system/test_utils.h"
+#include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 const int64_t kMicrosPerMs = 1000;
 const int64_t kPollTimeMicros = 10 * kMicrosPerMs;  // 10 ms.
 
 class WaitingThread : public base::SimpleThread {
@@ skipping 263 matching lines @@
     EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
     EXPECT_EQ(7u, context);
     EXPECT_GT(elapsed, (1 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (1 + 1) * test::EpsilonTimeout());
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo