summaryrefslogtreecommitdiffstats
path: root/mojo/common
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-19 00:05:26 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-19 00:05:26 +0000
commitf13fe4469df2b23be94dd057d67c1ac8264289ee (patch)
tree186038e2411bfa5836bf6361827c4588981db248 /mojo/common
parentb528ed03b61e2ceca5c52c5b0c8976b691deb732 (diff)
downloadchromium_src-f13fe4469df2b23be94dd057d67c1ac8264289ee.zip
chromium_src-f13fe4469df2b23be94dd057d67c1ac8264289ee.tar.gz
chromium_src-f13fe4469df2b23be94dd057d67c1ac8264289ee.tar.bz2
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
Diffstat (limited to 'mojo/common')
-rw-r--r--mojo/common/test/DEPS2
-rw-r--r--mojo/common/test/multiprocess_test_helper.cc2
-rw-r--r--mojo/common/test/multiprocess_test_helper.h2
-rw-r--r--mojo/common/test/multiprocess_test_helper_unittest.cc2
-rw-r--r--mojo/common/test/run_all_perftests.cc2
-rw-r--r--mojo/common/test/run_all_unittests.cc2
-rw-r--r--mojo/common/test/test_utils_posix.cc2
-rw-r--r--mojo/common/test/test_utils_win.cc2
8 files changed, 8 insertions, 8 deletions
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 {