Revert "Move mojo edk into mojo/edk"

mojo/system/shared_buffer_dispatcher_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/shared_buffer_dispatcher.h"
+#include "mojo/system/shared_buffer_dispatcher.h"
 
 #include <limits>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/dispatcher.h"
+#include "mojo/embedder/platform_shared_buffer.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/dispatcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 // NOTE(vtl): There's currently not much to test for in
 // |SharedBufferDispatcher::ValidateCreateOptions()|, but the tests should be
 // expanded if/when options are added, so I've kept the general form of the
 // tests from data_pipe_unittest.cc.
@@ skipping 266 matching lines @@
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher->MapBuffer(0, 0, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_FALSE(mapping);
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo