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

7 files changed, 7 insertions, 7 deletions

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 {