Revert "Move mojo edk into mojo/edk"

mojo/system/channel_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/channel.h"
+#include "mojo/system/channel.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/raw_channel.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/system/waiter.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/raw_channel.h"
+#include "mojo/system/test_utils.h"
+#include "mojo/system/waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 enum Tristate { TRISTATE_UNKNOWN = -1, TRISTATE_FALSE = 0, TRISTATE_TRUE = 1 };
 
 Tristate BoolToTristate(bool b) {
   return b ? TRISTATE_TRUE : TRISTATE_FALSE;
@@ skipping 285 matching lines @@
   mp->Close(0);
 
   EXPECT_TRUE(channel()->HasOneRef());
 }
 
 // TODO(vtl): More. ------------------------------------------------------------
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo