Mojo: Move mojo/system/embedder to mojo/embedder.

R=sky@chromium.org
TBR=darin@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257820 0039d316-1c4b-4281-b951-d872f2087c98

40 files changed, 85 insertions, 69 deletions

diff --git a/content/DEPS b/content/DEPS
index 0c0eab0..01732b9 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -37,7 +37,7 @@ include_rules = [
   "+gpu",
   "+mojo/public",
   "+mojo/bindings/js",
-  "+mojo/system/embedder",
+  "+mojo/embedder",
   "+net",
   "+ppapi",
   "+printing",
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 9d46963..cf97c798 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -163,7 +163,7 @@
 #if defined(USE_MOJO)
 #include "content/common/mojo/mojo_channel_init.h"
 #include "content/common/mojo/mojo_messages.h"
-#include "mojo/system/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 #endif
 
 extern bool g_exited_main_message_loop;
diff --git a/content/common/mojo/mojo_channel_init.cc b/content/common/mojo/mojo_channel_init.cc
index aaace72..7968f93 100644
--- a/content/common/mojo/mojo_channel_init.cc
+++ b/content/common/mojo/mojo_channel_init.cc
@@ -8,7 +8,7 @@
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/lock.h"
-#include "mojo/system/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 namespace content {
 
diff --git a/mojo/common/test/DEPS b/mojo/common/test/DEPS
index b817102..26b3ad9b 100644
--- a/mojo/common/test/DEPS
+++ b/mojo/common/test/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+mojo/system/embedder",
+  "+mojo/embedder",
 ]
diff --git a/mojo/common/test/multiprocess_test_helper.cc b/mojo/common/test/multiprocess_test_helper.cc
index a59a25b..ae7acae 100644
--- a/mojo/common/test/multiprocess_test_helper.cc
+++ b/mojo/common/test/multiprocess_test_helper.cc
@@ -9,7 +9,7 @@
 #include "base/process/kill.h"
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
-#include "mojo/system/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/common/test/multiprocess_test_helper.h b/mojo/common/test/multiprocess_test_helper.h
index db5450c..d518b6f 100644
--- a/mojo/common/test/multiprocess_test_helper.h
+++ b/mojo/common/test/multiprocess_test_helper.h
@@ -12,7 +12,7 @@
 #include "base/process/process_handle.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "testing/multiprocess_func_list.h"
 
 namespace mojo {
diff --git a/mojo/common/test/multiprocess_test_helper_unittest.cc b/mojo/common/test/multiprocess_test_helper_unittest.cc
index 6df1e07..0ed10e2 100644
--- a/mojo/common/test/multiprocess_test_helper_unittest.cc
+++ b/mojo/common/test/multiprocess_test_helper_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "mojo/common/test/test_utils.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_POSIX)
diff --git a/mojo/common/test/run_all_perftests.cc b/mojo/common/test/run_all_perftests.cc
index 3718bf1..b5032a6 100644
--- a/mojo/common/test/run_all_perftests.cc
+++ b/mojo/common/test/run_all_perftests.cc
@@ -4,8 +4,8 @@
 
 #include "base/test/perf_test_suite.h"
 #include "mojo/common/test/test_support_impl.h"
+#include "mojo/embedder/embedder.h"
 #include "mojo/public/tests/test_support_private.h"
-#include "mojo/system/embedder/embedder.h"
 
 int main(int argc, char** argv) {
   mojo::embedder::Init();
diff --git a/mojo/common/test/run_all_unittests.cc b/mojo/common/test/run_all_unittests.cc
index 185968c..6bf61c0 100644
--- a/mojo/common/test/run_all_unittests.cc
+++ b/mojo/common/test/run_all_unittests.cc
@@ -6,8 +6,8 @@
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "mojo/common/test/test_support_impl.h"
+#include "mojo/embedder/embedder.h"
 #include "mojo/public/tests/test_support_private.h"
-#include "mojo/system/embedder/embedder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 int main(int argc, char** argv) {
diff --git a/mojo/common/test/test_utils_posix.cc b/mojo/common/test/test_utils_posix.cc
index e4537d3..254d0a8 100644
--- a/mojo/common/test/test_utils_posix.cc
+++ b/mojo/common/test/test_utils_posix.cc
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include "base/posix/eintr_wrapper.h"
-#include "mojo/system/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/common/test/test_utils_win.cc b/mojo/common/test/test_utils_win.cc
index d4559dc..97ec466 100644
--- a/mojo/common/test/test_utils_win.cc
+++ b/mojo/common/test/test_utils_win.cc
@@ -6,7 +6,7 @@
 
 #include <windows.h>
 
-#include "mojo/system/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace test {
diff --git a/mojo/embedder/DEPS b/mojo/embedder/DEPS
new file mode 100644
index 0000000..902a75f
--- /dev/null
+++ b/mojo/embedder/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+mojo/system",
+]
diff --git a/mojo/embedder/README.md b/mojo/embedder/README.md
new file mode 100644
index 0000000..5510e99
--- /dev/null
+++ b/mojo/embedder/README.md
@@ -0,0 +1,13 @@
+Mojo Embedder API
+=================
+
+The Mojo Embedder API is an unstable, internal API to the Mojo system
+implementation. It should be used by code running on top of the system-level
+APIs to set up the Mojo environment (instead of directly instantiating things
+from src/mojo/system).
+
+Example uses: Mojo shell, to set up the Mojo environment for Mojo apps; Chromium
+code, to set up the Mojo IPC system for use between processes. Note that most
+code should use the Mojo Public API (under src/mojo/public) instead. The
+Embedder API should only be used to initialize the environment, set up the
+initial MessagePipe between two processes, etc.
diff --git a/mojo/system/embedder/embedder.cc b/mojo/embedder/embedder.cc
index 03b5440..45f2ba1 100644
--- a/mojo/system/embedder/embedder.cc
+++ b/mojo/embedder/embedder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/system/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #include "base/bind.h"
 #include "base/location.h"
diff --git a/mojo/system/embedder/embedder.h b/mojo/embedder/embedder.h
index 4ccc140..d6de6ac 100644
--- a/mojo/system/embedder/embedder.h
+++ b/mojo/embedder/embedder.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SYSTEM_EMBEDDER_EMBEDDER_H_
-#define MOJO_SYSTEM_EMBEDDER_EMBEDDER_H_
+#ifndef MOJO_EMBEDDER_EMBEDDER_H_
+#define MOJO_EMBEDDER_EMBEDDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/public/system/core.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
@@ -53,4 +53,4 @@ MOJO_SYSTEM_IMPL_EXPORT void DestroyChannelOnIOThread(
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_SYSTEM_EMBEDDER_EMBEDDER_H_
+#endif  // MOJO_EMBEDDER_EMBEDDER_H_
diff --git a/mojo/system/embedder/embedder_unittest.cc b/mojo/embedder/embedder_unittest.cc
index 719b746..9775238 100644
--- a/mojo/system/embedder/embedder_unittest.cc
+++ b/mojo/embedder/embedder_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/system/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 #include <string.h>
 
@@ -13,9 +13,9 @@
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "mojo/common/test/multiprocess_test_helper.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/test_embedder.h"
 #include "mojo/public/system/core.h"
-#include "mojo/system/embedder/platform_channel_pair.h"
-#include "mojo/system/embedder/test_embedder.h"
 #include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/system/embedder/platform_channel_pair.cc b/mojo/embedder/platform_channel_pair.cc
index 829eedf..783ced8 100644
--- a/mojo/system/embedder/platform_channel_pair.cc
+++ b/mojo/embedder/platform_channel_pair.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/system/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 #include "base/logging.h"
 
diff --git a/mojo/system/embedder/platform_channel_pair.h b/mojo/embedder/platform_channel_pair.h
index 39c45a4..f0629d6 100644
--- a/mojo/system/embedder/platform_channel_pair.h
+++ b/mojo/embedder/platform_channel_pair.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SYSTEM_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
-#define MOJO_SYSTEM_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#define MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/launch.h"
 #include "build/build_config.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace base {
@@ -86,4 +86,4 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformChannelPair {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_SYSTEM_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
diff --git a/mojo/system/embedder/platform_channel_pair_posix.cc b/mojo/embedder/platform_channel_pair_posix.cc
index 6e0a065..d9e65ed 100644
--- a/mojo/system/embedder/platform_channel_pair_posix.cc
+++ b/mojo/embedder/platform_channel_pair_posix.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/system/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 #include <fcntl.h>
 #include <sys/socket.h>
@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
 #include "base/strings/string_number_conversions.h"
-#include "mojo/system/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/system/embedder/platform_channel_pair_win.cc b/mojo/embedder/platform_channel_pair_win.cc
index 418e634..2248d31 100644
--- a/mojo/system/embedder/platform_channel_pair_win.cc
+++ b/mojo/embedder/platform_channel_pair_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/system/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 #include <windows.h>
 
@@ -14,7 +14,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
-#include "mojo/system/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace embedder {
diff --git a/mojo/system/embedder/platform_handle.cc b/mojo/embedder/platform_handle.cc
index 4dc8d89..6cce5e8 100644
--- a/mojo/system/embedder/platform_handle.cc
+++ b/mojo/embedder/platform_handle.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/system/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 #include "build/build_config.h"
 #if defined(OS_POSIX)
diff --git a/mojo/system/embedder/platform_handle.h b/mojo/embedder/platform_handle.h
index d132291..39da4a9 100644
--- a/mojo/system/embedder/platform_handle.h
+++ b/mojo/embedder/platform_handle.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SYSTEM_EMBEDDER_PLATFORM_HANDLE_H_
-#define MOJO_SYSTEM_EMBEDDER_PLATFORM_HANDLE_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_HANDLE_H_
+#define MOJO_EMBEDDER_PLATFORM_HANDLE_H_
 
 #include "build/build_config.h"
 #include "mojo/system/system_impl_export.h"
@@ -44,4 +44,4 @@ struct MOJO_SYSTEM_IMPL_EXPORT PlatformHandle {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_SYSTEM_EMBEDDER_PLATFORM_HANDLE_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_HANDLE_H_
diff --git a/mojo/system/embedder/scoped_platform_handle.h b/mojo/embedder/scoped_platform_handle.h
index 80489c3..b9cfb58 100644
--- a/mojo/system/embedder/scoped_platform_handle.h
+++ b/mojo/embedder/scoped_platform_handle.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SYSTEM_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
-#define MOJO_SYSTEM_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
+#ifndef MOJO_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
+#define MOJO_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
 
 #include "base/compiler_specific.h"
 #include "base/move.h"
-#include "mojo/system/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
@@ -58,4 +58,4 @@ class MOJO_SYSTEM_IMPL_EXPORT ScopedPlatformHandle {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_SYSTEM_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
+#endif  // MOJO_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
diff --git a/mojo/system/embedder/test_embedder.cc b/mojo/embedder/test_embedder.cc
index 37c9e8b..912a7ac 100644
--- a/mojo/system/embedder/test_embedder.cc
+++ b/mojo/embedder/test_embedder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/system/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
diff --git a/mojo/system/embedder/test_embedder.h b/mojo/embedder/test_embedder.h
index 2756d8e..a29adaf 100644
--- a/mojo/system/embedder/test_embedder.h
+++ b/mojo/embedder/test_embedder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SYSTEM_EMBEDDER_TEST_EMBEDDER_H_
-#define MOJO_SYSTEM_EMBEDDER_TEST_EMBEDDER_H_
+#ifndef MOJO_EMBEDDER_TEST_EMBEDDER_H_
+#define MOJO_EMBEDDER_TEST_EMBEDDER_H_
 
 #include "mojo/system/system_impl_export.h"
 
@@ -22,4 +22,4 @@ MOJO_SYSTEM_IMPL_EXPORT bool Shutdown();
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_SYSTEM_EMBEDDER_EMBEDDER_H_
+#endif  // MOJO_EMBEDDER_EMBEDDER_H_
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 48b51b5..d0ff900 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -103,6 +103,15 @@
         'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
       ],
       'sources': [
+        'embedder/embedder.cc',
+        'embedder/embedder.h',
+        'embedder/platform_channel_pair.cc',
+        'embedder/platform_channel_pair.h',
+        'embedder/platform_channel_pair_posix.cc',
+        'embedder/platform_channel_pair_win.cc',
+        'embedder/platform_handle.cc',
+        'embedder/platform_handle.h',
+        'embedder/scoped_platform_handle.h',
         'system/channel.cc',
         'system/channel.h',
         'system/constants.h',
@@ -116,15 +125,6 @@
         'system/data_pipe_producer_dispatcher.h',
         'system/dispatcher.cc',
         'system/dispatcher.h',
-        'system/embedder/embedder.cc',
-        'system/embedder/embedder.h',
-        'system/embedder/platform_channel_pair.cc',
-        'system/embedder/platform_channel_pair.h',
-        'system/embedder/platform_channel_pair_posix.cc',
-        'system/embedder/platform_channel_pair_win.cc',
-        'system/embedder/platform_handle.cc',
-        'system/embedder/platform_handle.h',
-        'system/embedder/scoped_platform_handle.h',
         'system/local_data_pipe.cc',
         'system/local_data_pipe.h',
         'system/local_message_pipe_endpoint.cc',
@@ -157,8 +157,8 @@
         # TODO(vtl): It's a little unfortunate that these end up in the same
         # component as non-test-only code. In the static build, this code should
         # hopefully be dead-stripped.
-        'system/embedder/test_embedder.cc',
-        'system/embedder/test_embedder.h',
+        'embedder/test_embedder.cc',
+        'embedder/test_embedder.h',
       ],
     },
     {
@@ -172,12 +172,12 @@
         'mojo_system_impl',
       ],
       'sources': [
+        'embedder/embedder_unittest.cc',
         'system/core_impl_unittest.cc',
         'system/core_test_base.cc',
         'system/core_test_base.h',
         'system/data_pipe_unittest.cc',
         'system/dispatcher_unittest.cc',
-        'system/embedder/embedder_unittest.cc',
         'system/local_data_pipe_unittest.cc',
         'system/message_pipe_dispatcher_unittest.cc',
         'system/message_pipe_unittest.cc',
diff --git a/mojo/shell/DEPS b/mojo/shell/DEPS
index fb5bed9..5cf2176 100644
--- a/mojo/shell/DEPS
+++ b/mojo/shell/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/system/embedder",
+  "+mojo/embedder",
   "+net",
   "+ui/gl",
 ]
diff --git a/mojo/shell/child_process.cc b/mojo/shell/child_process.cc
index 90338f5..fa195bb 100644
--- a/mojo/shell/child_process.cc
+++ b/mojo/shell/child_process.cc
@@ -7,10 +7,10 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
+#include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/shell/app_child_process.h"
 #include "mojo/shell/switches.h"
 #include "mojo/shell/test_child_process.h"
-#include "mojo/system/embedder/platform_channel_pair.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/child_process.h b/mojo/shell/child_process.h
index bf7a09e..2a0fd48 100644
--- a/mojo/shell/child_process.h
+++ b/mojo/shell/child_process.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 
 namespace base {
 class CommandLine;
diff --git a/mojo/shell/child_process_host.cc b/mojo/shell/child_process_host.cc
index 9d52fa2..34aa69e 100644
--- a/mojo/shell/child_process_host.cc
+++ b/mojo/shell/child_process_host.cc
@@ -15,9 +15,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "base/task_runner_util.h"
+#include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/switches.h"
-#include "mojo/system/embedder/platform_channel_pair.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/child_process_host.h b/mojo/shell/child_process_host.h
index d289627..da428be 100644
--- a/mojo/shell/child_process_host.h
+++ b/mojo/shell/child_process_host.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "base/process/process_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/shell/child_process.h"  // For |ChildProcess::Type|.
-#include "mojo/system/embedder/scoped_platform_handle.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 1b97e5e..3a000ce 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -5,13 +5,13 @@
 #include "mojo/shell/context.h"
 
 #include "base/command_line.h"
+#include "mojo/embedder/embedder.h"
 #include "mojo/gles2/gles2_support_impl.h"
 #include "mojo/shell/dynamic_service_loader.h"
 #include "mojo/shell/in_process_dynamic_service_runner.h"
 #include "mojo/shell/network_delegate.h"
 #include "mojo/shell/out_of_process_dynamic_service_runner.h"
 #include "mojo/shell/switches.h"
-#include "mojo/system/embedder/embedder.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/desktop/mojo_main.cc b/mojo/shell/desktop/mojo_main.cc
index 03a549c..dec73f4f 100644
--- a/mojo/shell/desktop/mojo_main.cc
+++ b/mojo/shell/desktop/mojo_main.cc
@@ -8,12 +8,12 @@
 #include "base/macros.h"  // TODO(vtl): Remove.
 #include "base/message_loop/message_loop.h"
 #include "mojo/common/message_pump_mojo.h"
+#include "mojo/embedder/embedder.h"
 #include "mojo/shell/child_process.h"
 #include "mojo/shell/child_process_host.h"  // TODO(vtl): Remove.
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
 #include "mojo/shell/run.h"
-#include "mojo/system/embedder/embedder.h"
 #include "ui/gl/gl_surface.h"
 
 namespace {
diff --git a/mojo/system/channel.h b/mojo/system/channel.h
index c50bf49..96c1f8c 100644
--- a/mojo/system/channel.h
+++ b/mojo/system/channel.h
@@ -15,8 +15,8 @@
 #include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/public/system/core.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/message_pipe.h"
 #include "mojo/system/raw_channel.h"
diff --git a/mojo/system/multiprocess_message_pipe_unittest.cc b/mojo/system/multiprocess_message_pipe_unittest.cc
index ced07df..e0eab3b 100644
--- a/mojo/system/multiprocess_message_pipe_unittest.cc
+++ b/mojo/system/multiprocess_message_pipe_unittest.cc
@@ -15,8 +15,8 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "mojo/common/test/multiprocess_test_helper.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/system/channel.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
 #include "mojo/system/local_message_pipe_endpoint.h"
 #include "mojo/system/message_pipe.h"
 #include "mojo/system/proxy_message_pipe_endpoint.h"
diff --git a/mojo/system/raw_channel.h b/mojo/system/raw_channel.h
index 40a65bf..8d8d235 100644
--- a/mojo/system/raw_channel.h
+++ b/mojo/system/raw_channel.h
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/system/constants.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/system_impl_export.h"
 
diff --git a/mojo/system/raw_channel_posix.cc b/mojo/system/raw_channel_posix.cc
index 563612f..5d04334 100644
--- a/mojo/system/raw_channel_posix.cc
+++ b/mojo/system/raw_channel_posix.cc
@@ -20,7 +20,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/synchronization/lock.h"
-#include "mojo/system/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/system/raw_channel_unittest.cc b/mojo/system/raw_channel_unittest.cc
index fbf2b87..1973689 100644
--- a/mojo/system/raw_channel_unittest.cc
+++ b/mojo/system/raw_channel_unittest.cc
@@ -23,9 +23,9 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "mojo/common/test/test_utils.h"
-#include "mojo/system/embedder/platform_channel_pair.h"
-#include "mojo/system/embedder/platform_handle.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_handle.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/system/raw_channel_win.cc b/mojo/system/raw_channel_win.cc
index 28cb264..ea2231f 100644
--- a/mojo/system/raw_channel_win.cc
+++ b/mojo/system/raw_channel_win.cc
@@ -16,7 +16,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "base/win/windows_version.h"
-#include "mojo/system/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace system {
diff --git a/mojo/system/remote_message_pipe_unittest.cc b/mojo/system/remote_message_pipe_unittest.cc
index e3d5c06..be4e8be 100644
--- a/mojo/system/remote_message_pipe_unittest.cc
+++ b/mojo/system/remote_message_pipe_unittest.cc
@@ -13,9 +13,9 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
+#include "mojo/embedder/platform_channel_pair.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/system/channel.h"
-#include "mojo/system/embedder/platform_channel_pair.h"
-#include "mojo/system/embedder/scoped_platform_handle.h"
 #include "mojo/system/local_message_pipe_endpoint.h"
 #include "mojo/system/message_pipe.h"
 #include "mojo/system/message_pipe_dispatcher.h"