Revert "Move mojo edk into mojo/edk"

mojo/system/message_pipe_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/message_pipe.h"
+#include "mojo/system/message_pipe.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/time/time.h"
-#include "mojo/edk/system/waiter.h"
-#include "mojo/edk/system/waiter_test_utils.h"
+#include "mojo/system/waiter.h"
+#include "mojo/system/waiter_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 // Tests:
 //  - only default flags
 //  - reading messages from a port
 //    - when there are no/one/two messages available for that port
@@ skipping 595 matching lines @@
     mp->CancelAllWaiters(1);
     mp->Close(1);
   }  // Joins |thread|.
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
   EXPECT_EQ(3u, context);
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo