summaryrefslogtreecommitdiffstats
path: root/ipc/mojo/ipc_channel_mojo.cc
diff options
context:
space:
mode:
authorTrent Apted <tapted@chromium.org>2014-10-03 11:51:20 +1000
committerTrent Apted <tapted@chromium.org>2014-10-03 01:52:13 +0000
commit5a14236a9c2a7b9191c31ddccc5f1d7a4f6278a9 (patch)
treef4107f31a06d889dc0dcee9cfd2f66d6d2f19575 /ipc/mojo/ipc_channel_mojo.cc
parent11cbd199704f82210205e8e956af686e179e2689 (diff)
downloadchromium_src-5a14236a9c2a7b9191c31ddccc5f1d7a4f6278a9.zip
chromium_src-5a14236a9c2a7b9191c31ddccc5f1d7a4f6278a9.tar.gz
chromium_src-5a14236a9c2a7b9191c31ddccc5f1d7a4f6278a9.tar.bz2
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}
Diffstat (limited to 'ipc/mojo/ipc_channel_mojo.cc')
-rw-r--r--ipc/mojo/ipc_channel_mojo.cc2
1 files changed, 1 insertions, 1 deletions
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"