Move mojo edk into mojo/edk

This creates a mojo/edk directory which contains the "embedder developer kit" aka the set of code needed to embed mojo code. mojo/edk/embedder = code from mojo/embedder mojo/edk/system = code from mojo/system mojo/edk/test = code used to test the previous two, from mojo/common/test mojo/edk/ can only depend on mojo/public/, base/ and itself. R=viettrungluu@chromium.org Review URL: https://codereview.chromium.org/621153003 Cr-Commit-Position: refs/heads/master@{#297958}
marcosholgado · Oct 3, 2014 · ee7ff19 · ee7ff19
1 parent 20894f5
commit ee7ff19
Show file tree

Hide file tree

Showing 199 changed files with 820 additions and 813 deletions.
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -172,10 +172,10 @@ static_library("browser") {
       "//content/app/resources",
       "//media",
       "//media/cast:net",
+      "//mojo/edk/system",
       "//mojo/environment:chromium",
       "//mojo/public/cpp/bindings",
       "//mojo/public/js/bindings",
-      "//mojo/system",
       "//net:extras",
       "//net:net_with_v8",
       "//storage/browser",

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
@@ -89,7 +89,7 @@ static_library("ui") {
       "//device/bluetooth",
       "//device/nfc",
       "//media",
-      "//mojo/system",
+      "//mojo/edk/system",
       "//net:net_with_v8",
       "//storage/browser",
       "//storage/common",

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -181,7 +181,7 @@ source_set("test_support_unit") {
     "//chrome:strings",
     "//chrome/browser",
     "//chrome/common",
+    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/system",
   ]
 }
diff --git a/chrome/test/DEPS b/chrome/test/DEPS
@@ -18,7 +18,7 @@ include_rules = [
   "+gin/public",
   "+grit",  # For generated headers. TODO(thestig): Remove.
   "+media/base",
-  "+mojo/embedder",
+  "+mojo/edk/embedder",
   "+sandbox/win/tests",
   "+win8/test",
 ]
diff --git a/chrome/test/base/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc
@@ -6,7 +6,7 @@
 #include "base/test/launcher/unit_test_launcher.h"
 #include "chrome/test/base/chrome_unit_test_suite.h"
 #include "content/public/test/unittest_test_suite.h"
-#include "mojo/embedder/test_embedder.h"
+#include "mojo/edk/embedder/test_embedder.h"
 
 int main(int argc, char **argv) {
   content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv));

diff --git a/content/DEPS b/content/DEPS
@@ -35,7 +35,7 @@ include_rules = [
   "+mojo/application_manager",
   "+mojo/bindings/js",
   "+mojo/common",
-  "+mojo/embedder",
+  "+mojo/edk/embedder",
   "+mojo/public",
   "+net",
   "+ppapi",

diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
@@ -52,9 +52,9 @@ if (is_ios) {
 } else {
   content_app_deps += [
     "//mojo/application_manager",
+    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/interfaces/application",
-    "//mojo/system",
   ]
 }
 

diff --git a/content/app/mojo/mojo_init.cc b/content/app/mojo/mojo_init.cc
@@ -5,8 +5,8 @@
 #include "content/app/mojo/mojo_init.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/embedder/embedder.h"
-#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/simple_platform_support.h"
 
 namespace content {
 

diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc
@@ -7,7 +7,7 @@
 #include "content/common/mojo/mojo_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "ipc/ipc_sender.h"
-#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/edk/embedder/platform_channel_pair.h"
 
 namespace content {
 namespace {

diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
@@ -7,8 +7,8 @@
 
 #include "base/process/process_handle.h"
 #include "content/common/mojo/service_registry_impl.h"
-#include "mojo/embedder/channel_init.h"
-#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
 
 namespace IPC {
 class Sender;

diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -26,7 +26,7 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
-#include "mojo/common/test/test_utils.h"
+#include "mojo/edk/test/test_utils.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/js/bindings/constants.h"

diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h
@@ -7,7 +7,7 @@
 
 #include "content/common/mojo/service_registry_impl.h"
 #include "ipc/ipc_platform_file.h"
-#include "mojo/embedder/channel_init.h"
+#include "mojo/edk/embedder/channel_init.h"
 
 namespace IPC {
 class Message;

diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
@@ -83,9 +83,9 @@ source_set("common") {
       "//gpu/skia_bindings",
       "//media",
       "//media:shared_memory_support",
+      "//mojo/edk/system",
       "//mojo/environment:chromium",
       "//mojo/public/interfaces/application",
-      "//mojo/system",
       "//sandbox",
       "//storage/browser",
       "//storage/common",

diff --git a/device/test/DEPS b/device/test/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/embedder",
+  "+mojo/edk/embedder",
   "+net/proxy",
   "+net/url_request",
 ]
diff --git a/device/test/run_all_unittests.cc b/device/test/run_all_unittests.cc
@@ -5,7 +5,7 @@
 #include "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "mojo/embedder/test_embedder.h"
+#include "mojo/edk/embedder/test_embedder.h"
 
 int main(int argc, char** argv) {
   base::TestSuite test_suite(argc, argv);

diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
@@ -250,10 +250,10 @@ test("unittests") {
     "//extensions/common",
     "//extensions/renderer",
     "//extensions/strings",
+    "//mojo/bindings/js",
+    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
-    "//mojo/bindings/js",
-    "//mojo/system",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/leveldatabase",

diff --git a/extensions/test/DEPS b/extensions/test/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "+content/public",
-  "+mojo/embedder",
+  "+mojo/edk/embedder",
 ]
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
@@ -13,7 +13,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/test/test_extensions_client.h"
-#include "mojo/embedder/test_embedder.h"
+#include "mojo/edk/embedder/test_embedder.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gl/gl_surface.h"
 

diff --git 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/system",
+    "//mojo/edk/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
@@ -1,4 +1,4 @@
 include_rules = [
   "+mojo/public",
-  "+mojo/embedder",
-]
+  "+mojo/edk/embedder",
+]
diff --git 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/embedder/embedder.h"
+#include "mojo/edk/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
@@ -5,7 +5,7 @@
 #include "ipc/mojo/ipc_channel_mojo_readers.h"
 
 #include "ipc/mojo/ipc_channel_mojo.h"
-#include "mojo/embedder/embedder.h"
+#include "mojo/edk/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
@@ -239,7 +239,7 @@ TEST_F(IPCChannelMojoErrorTest, SendFailWithPendingMessages) {
   CreateChannel(&listener);
   ASSERT_TRUE(ConnectChannel());
 
-  // This matches a value in mojo/system/constants.h
+  // This matches a value in mojo/edk/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
@@ -8,7 +8,7 @@
 #include "base/process/process_handle.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_platform_file.h"
-#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/edk/embedder/platform_channel_pair.h"
 
 namespace IPC {
 

diff --git 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/embedder/scoped_platform_handle.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
 
 namespace IPC {
 

diff --git 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/embedder/test_embedder.h"
+#include "mojo/edk/embedder/test_embedder.h"
 
 namespace {
 

diff --git 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/embedder/test_embedder.h"
+#include "mojo/edk/embedder/test_embedder.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"

diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
@@ -77,8 +77,8 @@ test("media_mojo_lib_unittests") {
     "//media",
     "//media/mojo/interfaces",
     "//mojo/common/test:run_all_unittests",
+    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/system",
     "//testing/gtest",
     ":lib"
   ]

diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
@@ -39,6 +39,8 @@ group("tests") {
     "//mojo/application_manager:mojo_application_manager_unittests",
     "//mojo/apps/js/test:mojo_apps_js_unittests",
     "//mojo/common:mojo_common_unittests",
+    "//mojo/edk/system:mojo_message_pipe_perftests",
+    "//mojo/edk/system:mojo_system_unittests",
     "//mojo/public/c/system/tests:perftests",
     "//mojo/public/cpp/application/tests:mojo_public_application_unittests",
     "//mojo/public/cpp/bindings/tests:mojo_public_bindings_unittests",
@@ -50,8 +52,6 @@ group("tests") {
     "//mojo/services/public/cpp/surfaces/tests:mojo_surfaces_lib_unittests",
     "//mojo/shell:mojo_external_application_tests",
     "//mojo/shell:mojo_shell_tests",
-    "//mojo/system:mojo_message_pipe_perftests",
-    "//mojo/system:mojo_system_unittests",
     "//mojo/tools:message_generator",
   ]
 

diff --git a/mojo/DEPS b/mojo/DEPS
@@ -2,6 +2,6 @@ include_rules = [
   "+base",
   "+build",
   "+mojo",
-  "-mojo/system",
+  "-mojo/edk/system",
   "+testing",
 ]
diff --git a/mojo/PRESUBMIT.py b/mojo/PRESUBMIT.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Presubmit script for mojo/embedder.
+"""Presubmit script for mojo
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.

diff --git a/mojo/android/javatests/init_library.cc b/mojo/android/javatests/init_library.cc
@@ -9,8 +9,8 @@
 #include "mojo/android/javatests/mojo_test_case.h"
 #include "mojo/android/javatests/validation_test_util.h"
 #include "mojo/android/system/core_impl.h"
-#include "mojo/embedder/embedder.h"
-#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/simple_platform_support.h"
 
 namespace {
 

diff --git a/mojo/application_manager/BUILD.gn b/mojo/application_manager/BUILD.gn
@@ -32,9 +32,9 @@ component("application_manager") {
     "//base/third_party/dynamic_annotations",
     "//net",
     "//url",
+    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/services/public/interfaces/content_handler:content_handler",
-    "//mojo/system",
   ]
 }
 

diff --git a/mojo/apps/js/test/BUILD.gn b/mojo/apps/js/test/BUILD.gn
@@ -12,7 +12,7 @@ test("mojo_apps_js_unittests") {
     "//mojo/apps/js",
     "//mojo/common",
     "//mojo/common/test:run_all_unittests",
-    "//mojo/common/test:test_support",
+    "//mojo/edk/test:test_support",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
   ]
 

diff --git a/mojo/apps/js/test/js_to_cpp_unittest.cc b/mojo/apps/js/test/js_to_cpp_unittest.cc
@@ -14,7 +14,7 @@
 #include "mojo/apps/js/mojo_runner_delegate.h"
 #include "mojo/apps/js/test/js_to_cpp.mojom.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/common/test/test_utils.h"
+#include "mojo/edk/test/test_utils.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
@@ -37,7 +37,7 @@ test("mojo_common_unittests") {
     "//base",
     "//base:message_loop_tests",
     "//mojo/common/test:run_all_unittests",
-    "//mojo/common/test:test_support",
+    "//mojo/edk/test:test_support",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/test_support:test_utils",
@@ -49,6 +49,5 @@ test("mojo_common_unittests") {
     "common_type_converters_unittest.cc",
     "handle_watcher_unittest.cc",
     "message_pump_mojo_unittest.cc",
-    "test/multiprocess_test_helper_unittest.cc",
   ]
 }