[go: nahoru, domu]

Mojo EDK -> Core: Misc top-levels

Moves all remaining dependencies from mojo/edk to mojo/core, covering the
top-levels that had relatively few dependencies to begin with.

All mechanical changes, hence TBR(s).

TBR=rkc@chromium.org
TBR=rogerta@chromium.org
TBR=sunnyps@chromium.org
TBR=mmenke@chromium.org
TBR=bbudge@chromium.org
TBR=fmalita@chromium.org
TBR=tsepez@chromium.org
TBR=peria@chromium.org
TBR=dcheng@chromium.org

Bug: None
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I4961ea707383e161d4b8f2c0de8341c0010b4485
Reviewed-on: https://chromium-review.googlesource.com/1126418
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572665}
diff --git a/ppapi/nacl_irt/irt_start.cc b/ppapi/nacl_irt/irt_start.cc
index cce1c1d..bf0c708 100644
--- a/ppapi/nacl_irt/irt_start.cc
+++ b/ppapi/nacl_irt/irt_start.cc
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 #include "base/at_exit.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/public/irt_core.h"
 #include "ppapi/nacl_irt/irt_interfaces.h"
@@ -35,7 +35,7 @@
                               MakeIPCHandle(NACL_CHROME_DESC_BASE + 1),
                               MakeIPCHandle(NACL_CHROME_DESC_BASE + 2));
   // The Mojo EDK must be initialized before using IPC.
-  mojo::edk::Init();
+  mojo::core::Init();
   ppapi::StartUpPlugin();
 
   nacl_irt_enter_user_code(info, chrome_irt_query);