Revert "Move mojo edk into mojo/edk"

This reverts commit ee7ff197a98da4636f33bd713de784948b487bd4.

Causing widespread checkdeps failures.

ERROR in src\content\browser\webui\web_ui_mojo_browsertest.cc
  Illegal include: "mojo/edk/test/test_utils.h" Because of no rule applying.

TBR=jamesr@chromium.org

Review URL: https://codereview.chromium.org/623883002

Cr-Commit-Position: refs/heads/master@{#297966}

9 files changed, 12 insertions, 12 deletions

diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn
index 29905bd..27c9cd9 100644
--- a/ipc/mojo/BUILD.gn
+++ b/ipc/mojo/BUILD.gn
@@ -24,7 +24,7 @@ component("mojo") {
     "//ipc",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
-    "//mojo/edk/system",
+    "//mojo/system",
   ]
 }
 
@@ -42,8 +42,8 @@ test("ipc_mojo_unittests") {
     "//ipc",
     "//ipc:test_support",
     "//ipc/mojo",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
     "//url",
   ]
 }
@@ -61,8 +61,8 @@ test("ipc_mojo_perftests") {
     "//ipc",
     "//ipc:test_support",
     "//ipc/mojo",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//mojo/system",
     "//url",
   ]
 }
diff --git a/ipc/mojo/DEPS b/ipc/mojo/DEPS
index 039e243..6706a1f 100644
--- a/ipc/mojo/DEPS
+++ b/ipc/mojo/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "+mojo/public",
-  "+mojo/edk/embedder",
-]
+  "+mojo/embedder",
+]
\ No newline at end of file
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc
index d3a9f79..00f5452 100644
--- a/ipc/mojo/ipc_channel_mojo.cc
+++ b/ipc/mojo/ipc_channel_mojo.cc
@@ -10,7 +10,7 @@
 #include "ipc/ipc_listener.h"
 #include "ipc/mojo/ipc_channel_mojo_readers.h"
 #include "ipc/mojo/ipc_mojo_bootstrap.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
 #include "ipc/file_descriptor_set_posix.h"
diff --git a/ipc/mojo/ipc_channel_mojo_readers.cc b/ipc/mojo/ipc_channel_mojo_readers.cc
index 2c231bf..227a946 100644
--- a/ipc/mojo/ipc_channel_mojo_readers.cc
+++ b/ipc/mojo/ipc_channel_mojo_readers.cc
@@ -5,7 +5,7 @@
 #include "ipc/mojo/ipc_channel_mojo_readers.h"
 
 #include "ipc/mojo/ipc_channel_mojo.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
 #include "ipc/file_descriptor_set_posix.h"
diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc
index 39224a0..ac1efd1 100644
--- a/ipc/mojo/ipc_channel_mojo_unittest.cc
+++ b/ipc/mojo/ipc_channel_mojo_unittest.cc
@@ -239,7 +239,7 @@ TEST_F(IPCChannelMojoErrorTest, SendFailWithPendingMessages) {
   CreateChannel(&listener);
   ASSERT_TRUE(ConnectChannel());
 
-  // This matches a value in mojo/edk/system/constants.h
+  // This matches a value in mojo/system/constants.h
   const int kMaxMessageNumBytes = 4 * 1024 * 1024;
   std::string overly_large_data(kMaxMessageNumBytes, '*');
   // This messages are queued as pending.
diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc
index 1b50b3f..0082fb8 100644
--- a/ipc/mojo/ipc_mojo_bootstrap.cc
+++ b/ipc/mojo/ipc_mojo_bootstrap.cc
@@ -8,7 +8,7 @@
 #include "base/process/process_handle.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_platform_file.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 namespace IPC {
 
diff --git a/ipc/mojo/ipc_mojo_bootstrap.h b/ipc/mojo/ipc_mojo_bootstrap.h
index 4d9e471..a099af9 100644
--- a/ipc/mojo/ipc_mojo_bootstrap.h
+++ b/ipc/mojo/ipc_mojo_bootstrap.h
@@ -9,7 +9,7 @@
 #include "base/process/process_handle.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_listener.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 
 namespace IPC {
 
diff --git a/ipc/mojo/ipc_mojo_perftest.cc b/ipc/mojo/ipc_mojo_perftest.cc
index 20893d4..81dcd70 100644
--- a/ipc/mojo/ipc_mojo_perftest.cc
+++ b/ipc/mojo/ipc_mojo_perftest.cc
@@ -6,7 +6,7 @@
 #include "ipc/ipc_perftest_support.h"
 #include "ipc/mojo/ipc_channel_mojo.h"
 #include "ipc/mojo/ipc_channel_mojo_host.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 namespace {
 
diff --git a/ipc/mojo/run_all_unittests.cc b/ipc/mojo/run_all_unittests.cc
index cc5b102..0989bf3 100644
--- a/ipc/mojo/run_all_unittests.cc
+++ b/ipc/mojo/run_all_unittests.cc
@@ -6,7 +6,7 @@
 #include "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"