summaryrefslogtreecommitdiffstats
path: root/mojo/common
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 21:48:06 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 21:48:06 +0000
commitd1ffc69c209a09a3793ebc129981ac535f12e446 (patch)
tree854a82bd40bd520988a65e00de70396688a709ad /mojo/common
parentd36e01e1054efff04a5eb8b6f734248ccdfc282d (diff)
downloadchromium_src-d1ffc69c209a09a3793ebc129981ac535f12e446.zip
chromium_src-d1ffc69c209a09a3793ebc129981ac535f12e446.tar.gz
chromium_src-d1ffc69c209a09a3793ebc129981ac535f12e446.tar.bz2
Mojo: Move system embedder API files to mojo/system/embedder.
(More changes to come -- in particular to reduce exports from mojo_system_impl -- but one thing at a time....) R=sky@chromium.org Review URL: https://codereview.chromium.org/139823003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/common')
-rw-r--r--mojo/common/test/DEPS2
-rw-r--r--mojo/common/test/multiprocess_test_base.cc2
-rw-r--r--mojo/common/test/multiprocess_test_base.h2
-rw-r--r--mojo/common/test/multiprocess_test_base_unittest.cc2
-rw-r--r--mojo/common/test/run_all_perftests.cc2
-rw-r--r--mojo/common/test/run_all_unittests.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/mojo/common/test/DEPS b/mojo/common/test/DEPS
index 902a75f..b817102 100644
--- a/mojo/common/test/DEPS
+++ b/mojo/common/test/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+mojo/system",
+ "+mojo/system/embedder",
]
diff --git a/mojo/common/test/multiprocess_test_base.cc b/mojo/common/test/multiprocess_test_base.cc
index 527c227..7785b93 100644
--- a/mojo/common/test/multiprocess_test_base.cc
+++ b/mojo/common/test/multiprocess_test_base.cc
@@ -10,7 +10,7 @@
#include "base/process/process_handle.h"
// TODO(vtl): Remove build_config.h include when fully implemented on Windows.
#include "build/build_config.h"
-#include "mojo/system/platform_channel_pair.h"
+#include "mojo/system/embedder/platform_channel_pair.h"
namespace mojo {
namespace test {
diff --git a/mojo/common/test/multiprocess_test_base.h b/mojo/common/test/multiprocess_test_base.h
index 2c8ce77..5e68fe1 100644
--- a/mojo/common/test/multiprocess_test_base.h
+++ b/mojo/common/test/multiprocess_test_base.h
@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/process/process_handle.h"
#include "base/test/multiprocess_test.h"
-#include "mojo/system/scoped_platform_handle.h"
+#include "mojo/system/embedder/scoped_platform_handle.h"
#include "testing/multiprocess_func_list.h"
namespace mojo {
diff --git a/mojo/common/test/multiprocess_test_base_unittest.cc b/mojo/common/test/multiprocess_test_base_unittest.cc
index 45f2b6b..9681ee3 100644
--- a/mojo/common/test/multiprocess_test_base_unittest.cc
+++ b/mojo/common/test/multiprocess_test_base_unittest.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "build/build_config.h"
-#include "mojo/system/scoped_platform_handle.h"
+#include "mojo/system/embedder/scoped_platform_handle.h"
#if defined(OS_POSIX)
#include <fcntl.h>
diff --git a/mojo/common/test/run_all_perftests.cc b/mojo/common/test/run_all_perftests.cc
index cf66be6..9bc4748 100644
--- a/mojo/common/test/run_all_perftests.cc
+++ b/mojo/common/test/run_all_perftests.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/test/perf_test_suite.h"
-#include "mojo/system/embedder.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 71783a8..617ab72 100644
--- a/mojo/common/test/run_all_unittests.cc
+++ b/mojo/common/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/system/embedder.h"
+#include "mojo/system/embedder/embedder.h"
int main(int argc, char** argv) {
base::TestSuite test_suite(argc, argv);