Revert "Move mojo edk into mojo/edk"

mojo/embedder/embedder.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/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/embedder/platform_support.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/core.h"
-#include "mojo/edk/system/entrypoints.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe_dispatcher.h"
-#include "mojo/edk/system/platform_handle_dispatcher.h"
-#include "mojo/edk/system/raw_channel.h"
+#include "mojo/embedder/platform_support.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/core.h"
+#include "mojo/system/entrypoints.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe_dispatcher.h"
+#include "mojo/system/platform_handle_dispatcher.h"
+#include "mojo/system/raw_channel.h"
 
 namespace mojo {
 namespace embedder {
 
 // This is defined here (instead of a header file), since it's opaque to the
 // outside world. But we need to define it before our (internal-only) functions
 // that use it.
 struct ChannelInfo {
   ChannelInfo() {}
   ~ChannelInfo() {}
@@ skipping 201 matching lines @@
 
   *platform_handle =
       static_cast<system::PlatformHandleDispatcher*>(dispatcher.get())
           ->PassPlatformHandle()
           .Pass();
   return MOJO_RESULT_OK;
 }
 
 }  // namespace embedder
 }  // namespace mojo