Mojo EDK -> Core: ash, chrome, mash, ui
Moves dependencies from mojo/edk to mojo/core within the following
top-level directories: ash, chrome, mash, and ui
All mechanical changes, hence TBR(s).
TBR=sky@chromium.org
Bug: None
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:linux_vr;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I7fb3cca9e08ef42edc06be5b78ee10a359f4a703
Reviewed-on: https://chromium-review.googlesource.com/1126408
Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572634}diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index bcd9355..ac56057 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -1643,7 +1643,7 @@
"//content/public/browser",
"//content/test:test_support",
"//device/bluetooth",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//net",
"//skia",
"//testing/gtest",
@@ -2001,7 +2001,7 @@
"//components/user_manager",
"//components/user_manager:test_support",
"//device/bluetooth",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//net:net",
"//services/ui/public/cpp/input_devices:test_support",
"//services/ui/public/interfaces",
@@ -2075,7 +2075,7 @@
"//ash/public/cpp",
"//base/test:test_support",
"//cc/base",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//testing/gtest",
"//testing/perf",
"//ui/aura",
diff --git a/ash/accelerators/DEPS b/ash/accelerators/DEPS
index 0d82215..2f46d168 100644
--- a/ash/accelerators/DEPS
+++ b/ash/accelerators/DEPS
@@ -3,6 +3,6 @@
"+ash/host"
],
"accelerator_interactive_uitest_chromeos\.cc": [
- "+mojo/edk/embedder/embedder.h"
+ "+mojo/core/embedder/embedder.h"
],
}
diff --git a/ash/app_list/BUILD.gn b/ash/app_list/BUILD.gn
index 9aa22d3..51be4a9 100644
--- a/ash/app_list/BUILD.gn
+++ b/ash/app_list/BUILD.gn
@@ -213,7 +213,7 @@
"//ash/public/cpp/app_list/vector_icons",
"//base",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gtest",
"//ui/accessibility",
diff --git a/ash/app_list/test/DEPS b/ash/app_list/test/DEPS
index 07617a9a..333f2a7 100644
--- a/ash/app_list/test/DEPS
+++ b/ash/app_list/test/DEPS
@@ -4,6 +4,6 @@
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
}
diff --git a/ash/app_list/test/run_all_unittests.cc b/ash/app_list/test/run_all_unittests.cc
index 9099e2f..f38da10 100644
--- a/ash/app_list/test/run_all_unittests.cc
+++ b/ash/app_list/test/run_all_unittests.cc
@@ -11,7 +11,7 @@
#include "base/test/test_discardable_memory_allocator.h"
#include "base/test/test_suite.h"
#include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h"
#include "ui/base/resource/resource_bundle.h"
@@ -64,7 +64,7 @@
int main(int argc, char** argv) {
AppListTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(
argc, argv,
diff --git a/ash/test/DEPS b/ash/test/DEPS
index 1e2fa21..49bca20 100644
--- a/ash/test/DEPS
+++ b/ash/test/DEPS
@@ -2,7 +2,7 @@
# In general files in this directory should not depend upon content.
"+cc/test",
"+components/viz/test",
- "+mojo/edk",
+ "+mojo/core/embedder",
]
specific_include_rules = {
diff --git a/ash/test/ash_interactive_ui_test_base.cc b/ash/test/ash_interactive_ui_test_base.cc
index 3fb9e511..a8b6ca99 100644
--- a/ash/test/ash_interactive_ui_test_base.cc
+++ b/ash/test/ash_interactive_ui_test_base.cc
@@ -6,7 +6,7 @@
#include "base/lazy_instance.h"
#include "base/path_service.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/aura/env.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
@@ -18,7 +18,7 @@
class MojoInitializer {
public:
- MojoInitializer() { mojo::edk::Init(); }
+ MojoInitializer() { mojo::core::Init(); }
};
base::LazyInstance<MojoInitializer>::Leaky mojo_initializer;
diff --git a/ash/test/ash_perftests.cc b/ash/test/ash_perftests.cc
index 2bee2a0..2ecc24c 100644
--- a/ash/test/ash_perftests.cc
+++ b/ash/test/ash_perftests.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/test/launcher/unit_test_launcher.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/gl/gl_switches.h"
namespace {
@@ -24,7 +24,7 @@
int main(int argc, char** argv) {
ash::AshTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTestsSerially(
argc, argv, base::Bind(&RunHelper, base::Unretained(&test_suite)));
}
diff --git a/ash/test/ash_unittests.cc b/ash/test/ash_unittests.cc
index 4f7557b..e2a413e3 100644
--- a/ash/test/ash_unittests.cc
+++ b/ash/test/ash_unittests.cc
@@ -5,12 +5,12 @@
#include "ash/test/ash_test_suite.h"
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
int main(int argc, char** argv) {
ash::AshTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(
argc, argv,
base::Bind(&ash::AshTestSuite::Run, base::Unretained(&test_suite)));
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 652022f..5d7d370 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -298,11 +298,11 @@
}
if (is_chromeos || is_win) {
- data_deps += [ "//mojo/edk:mojo_core" ]
+ data_deps += [ "//mojo/core:shared_library" ]
}
if (is_chromeos) {
- data_deps += [ "//mojo/edk:mojo_core_for_arc" ]
+ data_deps += [ "//mojo/core:shared_libraries_for_arc" ]
}
# These files are used by the installer so we need a public dep.
diff --git a/chrome/app_shim/BUILD.gn b/chrome/app_shim/BUILD.gn
index 986fa9d..d2c12e7a 100644
--- a/chrome/app_shim/BUILD.gn
+++ b/chrome/app_shim/BUILD.gn
@@ -19,7 +19,7 @@
"//chrome/common",
"//chrome/common:mojo_bindings",
"//ipc",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//ui/base",
]
}
diff --git a/chrome/app_shim/DEPS b/chrome/app_shim/DEPS
index f8d2667..90bfe99 100644
--- a/chrome/app_shim/DEPS
+++ b/chrome/app_shim/DEPS
@@ -1,5 +1,5 @@
include_rules = [
"+chrome/grit/generated_resources.h",
"+chrome/installer/launcher_support",
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
diff --git a/chrome/app_shim/chrome_main_app_mode_mac.mm b/chrome/app_shim/chrome_main_app_mode_mac.mm
index 70247313..65b4b414c 100644
--- a/chrome/app_shim/chrome_main_app_mode_mac.mm
+++ b/chrome/app_shim/chrome_main_app_mode_mac.mm
@@ -36,8 +36,8 @@
#include "chrome/common/mac/app_shim.mojom.h"
#include "chrome/common/mac/app_shim_messages.h"
#include "chrome/grit/generated_resources.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "mojo/core/embedder/embedder.h"
+#include "mojo/core/embedder/scoped_ipc_support.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/platform/named_platform_channel.h"
#include "mojo/public/cpp/system/isolated_connection.h"
@@ -616,10 +616,10 @@
io_thread->StartWithOptions(io_thread_options);
g_io_thread = io_thread;
- mojo::edk::Init();
- mojo::edk::ScopedIPCSupport ipc_support(
+ mojo::core::Init();
+ mojo::core::ScopedIPCSupport ipc_support(
io_thread->task_runner(),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::FAST);
// Find already running instances of Chrome.
pid_t pid = -1;
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 57025ed..6de8014 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1840,7 +1840,7 @@
"//media/mojo/interfaces:mirror_service_remoting",
"//media/mojo/interfaces:remoting",
"//media/mojo/services",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//mojo/public/cpp/bindings",
"//net",
"//net:extras",
diff --git a/chrome/browser/printing/cloud_print/test/DEPS b/chrome/browser/printing/cloud_print/test/DEPS
index d2e2b4a..9318320 100644
--- a/chrome/browser/printing/cloud_print/test/DEPS
+++ b/chrome/browser/printing/cloud_print/test/DEPS
@@ -2,5 +2,5 @@
# Service-side mockup tests need service classes to mock.
"+chrome/service",
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
index 596a962..69d2186 100644
--- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
+++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
@@ -52,8 +52,8 @@
#include "ipc/ipc.mojom.h"
#include "ipc/ipc_channel_mojo.h"
#include "ipc/ipc_channel_proxy.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "mojo/core/embedder/embedder.h"
+#include "mojo/core/embedder/scoped_ipc_support.h"
#include "mojo/public/cpp/platform/named_platform_channel.h"
#include "mojo/public/cpp/system/isolated_connection.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -216,10 +216,10 @@
EXPECT_TRUE(service_process.Initialize(&main_message_loop, state));
// Needed for IPC.
- mojo::edk::Init();
- mojo::edk::ScopedIPCSupport ipc_support(
+ mojo::core::Init();
+ mojo::core::ScopedIPCSupport ipc_support(
service_process.io_task_runner(),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::FAST);
MockServiceIPCServer server(&service_process,
service_process.io_task_runner(),
@@ -469,10 +469,10 @@
}
TEST_F(CloudPrintProxyPolicyStartupTest, StartAndShutdown) {
- mojo::edk::Init();
- mojo::edk::ScopedIPCSupport ipc_support(
+ mojo::core::Init();
+ mojo::core::ScopedIPCSupport ipc_support(
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::FAST);
base::Process process =
Launch("CloudPrintMockService_StartEnabledWaitForQuit");
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
index 7e817d82..7a16171 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
@@ -16,8 +16,8 @@
#include "base/strings/string_number_conversions.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/threading/thread.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "mojo/core/embedder/embedder.h"
+#include "mojo/core/embedder/scoped_ipc_support.h"
#include "mojo/public/cpp/platform/platform_channel.h"
#include "mojo/public/cpp/system/invitation.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -214,16 +214,16 @@
if (options_.crash_point() == CrashPoint::kOnStartup)
exit(kDeliberateCrashExitCode);
- mojo::edk::Init();
+ mojo::core::Init();
base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
base::Thread io_thread("IPCThread");
EXPECT_TRUE(io_thread.StartWithOptions(thread_options));
if (::testing::Test::HasFailure())
return kInternalTestFailureExitCode;
- mojo::edk::ScopedIPCSupport ipc_support(
+ mojo::core::ScopedIPCSupport ipc_support(
io_thread.task_runner(),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::CLEAN);
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::CLEAN);
auto channel_endpoint =
mojo::PlatformChannel::RecoverPassedEndpointFromCommandLine(
diff --git a/chrome/browser/vr/BUILD.gn b/chrome/browser/vr/BUILD.gn
index df2aafa..a99b988e 100644
--- a/chrome/browser/vr/BUILD.gn
+++ b/chrome/browser/vr/BUILD.gn
@@ -414,7 +414,7 @@
"//components/security_state/core",
"//components/toolbar:vector_icons",
"//content/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gtest",
"//ui/accessibility:ax_enums_mojo",
diff --git a/chrome/browser/vr/test/DEPS b/chrome/browser/vr/test/DEPS
index 9a5b6ca..806aa67 100644
--- a/chrome/browser/vr/test/DEPS
+++ b/chrome/browser/vr/test/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
"+device/vr/openvr/test/test_hook.h",
"+device/vr/openvr/openvr_device_provider.h"
]
\ No newline at end of file
diff --git a/chrome/browser/vr/test/vr_test_suite.cc b/chrome/browser/vr/test/vr_test_suite.cc
index bf5a4761..6e95bee 100644
--- a/chrome/browser/vr/test/vr_test_suite.cc
+++ b/chrome/browser/vr/test/vr_test_suite.cc
@@ -10,7 +10,7 @@
#include "base/path_service.h"
#include "base/test/scoped_task_environment.h"
#include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
@@ -28,7 +28,7 @@
std::make_unique<base::test::ScopedTaskEnvironment>(
base::test::ScopedTaskEnvironment::MainThreadType::UI);
- mojo::edk::Init();
+ mojo::core::Init();
base::FilePath pak_path;
#if defined(OS_ANDROID)
diff --git a/chrome/service/DEPS b/chrome/service/DEPS
index 7c923f5..9e3b62a 100644
--- a/chrome/service/DEPS
+++ b/chrome/service/DEPS
@@ -6,6 +6,6 @@
"+components/network_session_configurator/common",
"+components/prefs",
"+components/version_info",
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
"+sandbox/win/src",
]
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
index 81df226..0c5c0a4 100644
--- a/chrome/service/service_process.cc
+++ b/chrome/service/service_process.cc
@@ -45,8 +45,8 @@
#include "components/language/core/common/locale_util.h"
#include "components/network_session_configurator/common/network_switches.h"
#include "components/prefs/json_pref_store.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "mojo/core/embedder/embedder.h"
+#include "mojo/core/embedder/scoped_ipc_support.h"
#include "net/base/network_change_notifier.h"
#include "net/url_request/url_fetcher.h"
#include "ui/base/l10n/l10n_util.h"
@@ -182,10 +182,10 @@
}
// Initialize Mojo early so things can use it.
- mojo::edk::Init();
- mojo_ipc_support_.reset(new mojo::edk::ScopedIPCSupport(
+ mojo::core::Init();
+ mojo_ipc_support_.reset(new mojo::core::ScopedIPCSupport(
io_thread_->task_runner(),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST));
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::FAST));
request_context_getter_ = new ServiceURLRequestContextGetter();
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index d5417c5c..73bddc0 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -4507,7 +4507,7 @@
"//chrome:strings",
"//chrome/browser",
"//chrome/common",
- "//mojo/edk/test:test_support",
+ "//mojo/core/test:test_support",
]
if (is_win) {
@@ -4815,7 +4815,7 @@
"//device/fido:test_support",
"//extensions/buildflags",
"//google_apis:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//net",
"//net:net_resources",
"//net:test_support",
@@ -4983,7 +4983,7 @@
"//ash/public/interfaces:test_interfaces",
"//chrome/browser/media/router:test_support",
"//chromeos",
- "//mojo/edk",
+ "//mojo/core/embedder",
]
data += [
diff --git a/chrome/test/DEPS b/chrome/test/DEPS
index 6062c0b..2797e54 100644
--- a/chrome/test/DEPS
+++ b/chrome/test/DEPS
@@ -24,7 +24,7 @@
"+gin/public",
"+media/base",
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
"+sandbox/win/tests",
"+third_party/ocmock",
"+third_party/webrtc",
diff --git a/chrome/test/base/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc
index 89f2415..a69c7eb 100644
--- a/chrome/test/base/run_all_unittests.cc
+++ b/chrome/test/base/run_all_unittests.cc
@@ -9,7 +9,7 @@
#include "build/build_config.h"
#include "chrome/test/base/chrome_unit_test_suite.h"
#include "content/public/test/unittest_test_suite.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "mojo/core/embedder/scoped_ipc_support.h"
#if defined(OS_WIN)
#include "chrome/install_static/test/scoped_install_details.h"
@@ -19,9 +19,9 @@
content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv));
base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
- mojo::edk::ScopedIPCSupport ipc_support(
+ mojo::core::ScopedIPCSupport ipc_support(
test_io_thread.task_runner(),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::FAST);
#if defined(OS_WIN)
install_static::ScopedInstallDetails scoped_install_details;
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 448fe85..c7b9730f 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -13,7 +13,7 @@
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/view_event_test_platform_part.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/base/ime/input_method_initializer.h"
#include "ui/base/test/ui_controls.h"
#include "ui/compositor/test/context_factories_for_test.h"
@@ -74,7 +74,7 @@
// Mojo is initialized here similar to how each browser test case initializes
// Mojo when starting. This only works because each interactive_ui_test runs
// in a new process.
- mojo::edk::Init();
+ mojo::core::Init();
ui::InitializeInputMethodForTesting();
diff --git a/chrome/utility/importer/DEPS b/chrome/utility/importer/DEPS
index a02ca6bbf..52ab1e7 100644
--- a/chrome/utility/importer/DEPS
+++ b/chrome/utility/importer/DEPS
@@ -8,6 +8,6 @@
specific_include_rules = {
"firefox_importer_unittest_utils_mac\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
],
}
diff --git a/mash/BUILD.gn b/mash/BUILD.gn
index ef752ca..d5110af 100644
--- a/mash/BUILD.gn
+++ b/mash/BUILD.gn
@@ -100,7 +100,7 @@
"//cc",
"//cc:test_support",
"//components/viz/service",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//services/catalog:lib",
"//ui/aura",
"//ui/base",
diff --git a/mash/runner/BUILD.gn b/mash/runner/BUILD.gn
index 92b79ef..4cb3030c 100644
--- a/mash/runner/BUILD.gn
+++ b/mash/runner/BUILD.gn
@@ -13,7 +13,7 @@
"//base",
"//base:i18n",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//services/service_manager",
"//services/service_manager/runner:init",
"//services/service_manager/standalone",
diff --git a/mash/runner/DEPS b/mash/runner/DEPS
index 61ef5fec..9243dcd6 100644
--- a/mash/runner/DEPS
+++ b/mash/runner/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
diff --git a/mash/runner/main.cc b/mash/runner/main.cc
index 73c3ae5..9484317 100644
--- a/mash/runner/main.cc
+++ b/mash/runner/main.cc
@@ -25,8 +25,8 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread.h"
#include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "mojo/core/embedder/embedder.h"
+#include "mojo/core/embedder/scoped_ipc_support.h"
#include "services/service_manager/runner/init.h"
#include "services/service_manager/standalone/context.h"
#include "services/service_manager/switches.h"
@@ -72,7 +72,7 @@
base::i18n::InitializeICU();
- mojo::edk::Init();
+ mojo::core::Init();
base::Thread ipc_thread("IPC thread");
ipc_thread.StartWithOptions(
@@ -80,9 +80,9 @@
// We can use fast IPC shutdown here since service manager termination must
// effectively bring down all services as well.
- mojo::edk::ScopedIPCSupport ipc_support(
+ mojo::core::ScopedIPCSupport ipc_support(
ipc_thread.task_runner(),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::FAST);
base::test::ScopedTaskEnvironment scoped_task_environment;
service_manager::Context service_manager_context(nullptr,
diff --git a/mash/test/DEPS b/mash/test/DEPS
index 9f6d609..53a88d2 100644
--- a/mash/test/DEPS
+++ b/mash/test/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+ash/test",
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
"+services/catalog",
]
diff --git a/mash/test/mash_unittests.cc b/mash/test/mash_unittests.cc
index b517633..b9b2bd5 100644
--- a/mash/test/mash_unittests.cc
+++ b/mash/test/mash_unittests.cc
@@ -8,8 +8,8 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "base/threading/thread.h"
#include "mash/test/mash_test_suite.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "mojo/core/embedder/embedder.h"
+#include "mojo/core/embedder/scoped_ipc_support.h"
#include "services/catalog/catalog.h"
namespace {
@@ -25,13 +25,13 @@
catalog::Catalog::LoadDefaultCatalogManifest(
base::FilePath(kCatalogFilename));
- mojo::edk::Init();
+ mojo::core::Init();
base::Thread ipc_thread("IPC thread");
ipc_thread.StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
- mojo::edk::ScopedIPCSupport ipc_support(
+ mojo::core::ScopedIPCSupport ipc_support(
ipc_thread.task_runner(),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::CLEAN);
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::CLEAN);
return base::LaunchUnitTests(argc, argv,
base::Bind(&mash::test::MashTestSuite::Run,
diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
index ccd6833a..d96ec3b 100644
--- a/ui/accessibility/BUILD.gn
+++ b/ui/accessibility/BUILD.gn
@@ -215,8 +215,8 @@
":test_support",
"//base",
"//base/test:test_support",
- "//mojo/edk",
- "//mojo/edk/test:test_support",
+ "//mojo/core/embedder",
+ "//mojo/core/test:test_support",
"//mojo/public/cpp/test_support:test_utils",
"//skia",
"//testing/gtest",
diff --git a/ui/accessibility/DEPS b/ui/accessibility/DEPS
index ab5cea7..605f104 100644
--- a/ui/accessibility/DEPS
+++ b/ui/accessibility/DEPS
@@ -12,7 +12,7 @@
specific_include_rules = {
"run_all_unittests.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
],
"ax_assistant_util.h": [
"+ui/accessibility/mojom",
diff --git a/ui/accessibility/run_all_unittests.cc b/ui/accessibility/run_all_unittests.cc
index 3cdbe27..ae25b612a78 100644
--- a/ui/accessibility/run_all_unittests.cc
+++ b/ui/accessibility/run_all_unittests.cc
@@ -6,10 +6,10 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
#include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
int main(int argc, char** argv) {
- mojo::edk::Init();
+ mojo::core::Init();
base::TestSuite test_suite(argc, argv);
return base::LaunchUnitTests(
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index 9d09a03..ef79ede 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn
@@ -401,7 +401,7 @@
"//base/test:test_support",
"//cc/mojo_embedder",
"//components/viz/client",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//net",
"//services/ui/common:task_runner_test_base",
"//services/ui/public/cpp",
diff --git a/ui/aura/test/DEPS b/ui/aura/test/DEPS
index 8732326..7b065fa 100644
--- a/ui/aura/test/DEPS
+++ b/ui/aura/test/DEPS
@@ -1,7 +1,7 @@
include_rules = [
"+cc/test",
"+components/viz/test",
- "+mojo/edk/embedder/embedder.h",
+ "+mojo/core/embedder/embedder.h",
"+services/ui/public/cpp/input_devices",
"+ui/gl",
"+ui/wm/core/wm_state.h",
diff --git a/ui/aura/test/run_all_unittests.cc b/ui/aura/test/run_all_unittests.cc
index f167887..fc1f8a3 100644
--- a/ui/aura/test/run_all_unittests.cc
+++ b/ui/aura/test/run_all_unittests.cc
@@ -6,7 +6,7 @@
#include "base/macros.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/aura/env.h"
#include "ui/aura/test/aura_test_suite.h"
#include "ui/gl/gl_surface.h"
@@ -62,7 +62,7 @@
int main(int argc, char** argv) {
AuraTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(
argc, argv,
base::BindOnce(&base::TestSuite::Run, base::Unretained(&test_suite)));
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index bbba60a..7798561 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -921,7 +921,7 @@
":ui_base_unittests_bundle_data",
"//base",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//net",
"//net:test_support",
"//skia",
diff --git a/ui/base/test/DEPS b/ui/base/test/DEPS
index da738ce..b5f2b17 100644
--- a/ui/base/test/DEPS
+++ b/ui/base/test/DEPS
@@ -1,5 +1,5 @@
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
],
}
diff --git a/ui/base/test/run_all_unittests.cc b/ui/base/test/run_all_unittests.cc
index c7b785a..7ba08a5 100644
--- a/ui/base/test/run_all_unittests.cc
+++ b/ui/base/test/run_all_unittests.cc
@@ -9,7 +9,7 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
#include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
@@ -98,7 +98,7 @@
int main(int argc, char** argv) {
UIBaseTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(
argc, argv,
base::BindOnce(&UIBaseTestSuite::Run, base::Unretained(&test_suite)));
diff --git a/ui/chromeos/BUILD.gn b/ui/chromeos/BUILD.gn
index 913671f..6b8115d 100644
--- a/ui/chromeos/BUILD.gn
+++ b/ui/chromeos/BUILD.gn
@@ -69,7 +69,7 @@
":chromeos",
"//base/test:test_support",
"//chromeos",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gtest",
"//ui/aura:test_support",
diff --git a/ui/chromeos/DEPS b/ui/chromeos/DEPS
index 2f1a2a1..e70987f 100644
--- a/ui/chromeos/DEPS
+++ b/ui/chromeos/DEPS
@@ -24,6 +24,6 @@
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
}
diff --git a/ui/chromeos/run_all_unittests.cc b/ui/chromeos/run_all_unittests.cc
index ac528c4..bc4c83cd 100644
--- a/ui/chromeos/run_all_unittests.cc
+++ b/ui/chromeos/run_all_unittests.cc
@@ -10,7 +10,7 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h"
#include "ui/base/resource/resource_bundle.h"
@@ -53,7 +53,7 @@
int main(int argc, char** argv) {
UIChromeOSTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(
argc, argv,
diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
index 3f4eb3e..7c3764bb 100644
--- a/ui/compositor/BUILD.gn
+++ b/ui/compositor/BUILD.gn
@@ -222,7 +222,7 @@
"//components/viz/common",
"//components/viz/service",
"//components/viz/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gmock",
"//testing/gtest",
diff --git a/ui/compositor/DEPS b/ui/compositor/DEPS
index 753ceb7..1060fa2a 100644
--- a/ui/compositor/DEPS
+++ b/ui/compositor/DEPS
@@ -16,7 +16,7 @@
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
],
".*_(unit|pixel|perf)test.*\.cc": [
"+components/viz/test",
diff --git a/ui/compositor/run_all_unittests.cc b/ui/compositor/run_all_unittests.cc
index 40b96f9..92a6dc6 100644
--- a/ui/compositor/run_all_unittests.cc
+++ b/ui/compositor/run_all_unittests.cc
@@ -4,13 +4,13 @@
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/compositor/test/test_suite.h"
int main(int argc, char** argv) {
ui::test::CompositorTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(
argc, argv,
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index b55a4be..8d014f0 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -184,7 +184,7 @@
"//base",
"//base/test:test_support",
"//cc/base",
- "//mojo/edk/test:run_all_unittests",
+ "//mojo/core/test:run_all_unittests",
"//testing/gmock",
"//testing/gtest",
"//ui/display/manager",
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 45354be3..681eaef 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -495,7 +495,7 @@
"//base/test:test_support",
"//cc",
"//ipc:test_support",
- "//mojo/edk/test:run_all_unittests",
+ "//mojo/core/test:run_all_unittests",
"//mojo/public/cpp/bindings",
"//skia",
"//testing/gmock",
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index ab2b7c9..fec5071 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -799,7 +799,7 @@
if (!is_ios) {
deps += [
"//cc/paint",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//mojo/public/cpp/bindings",
"//ui/gfx/geometry/mojo:unit_test",
"//ui/gfx/image/mojo:unit_test",
diff --git a/ui/gfx/test/DEPS b/ui/gfx/test/DEPS
index 047e860..960c0d1 100644
--- a/ui/gfx/test/DEPS
+++ b/ui/gfx/test/DEPS
@@ -1,6 +1,6 @@
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder/embedder.h",
+ "+mojo/core/embedder/embedder.h",
"+ui/base/resource/resource_bundle.h",
"+ui/base/ui_base_paths.h",
],
diff --git a/ui/gfx/test/run_all_unittests.cc b/ui/gfx/test/run_all_unittests.cc
index 824703c..6e8079f9 100644
--- a/ui/gfx/test/run_all_unittests.cc
+++ b/ui/gfx/test/run_all_unittests.cc
@@ -24,7 +24,7 @@
#endif
#if !defined(OS_IOS)
-#include "mojo/edk/embedder/embedder.h" // nogncheck
+#include "mojo/core/embedder/embedder.h" // nogncheck
#endif
namespace {
@@ -90,7 +90,7 @@
GfxTestSuite test_suite(argc, argv);
#if !defined(OS_IOS)
- mojo::edk::Init();
+ mojo::core::Init();
#endif
return base::LaunchUnitTests(
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index a7e95c7..16a066a5 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -471,7 +471,7 @@
if (use_ozone) {
deps += [
- "//mojo/edk",
+ "//mojo/core/embedder",
"//services/service_manager/public/cpp/test:test_support",
"//ui/ozone",
]
diff --git a/ui/gl/test/DEPS b/ui/gl/test/DEPS
index 7a0d934..b3e4762 100644
--- a/ui/gl/test/DEPS
+++ b/ui/gl/test/DEPS
@@ -2,6 +2,6 @@
"+ui/base",
"+ui/ozone/public",
"+ui/platform_window/x11",
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
"+services/service_manager/public",
]
diff --git a/ui/gl/test/run_all_unittests.cc b/ui/gl/test/run_all_unittests.cc
index 5219c05..0ecee04 100644
--- a/ui/gl/test/run_all_unittests.cc
+++ b/ui/gl/test/run_all_unittests.cc
@@ -17,7 +17,7 @@
#if defined(USE_OZONE)
#include "base/command_line.h"
-#include "mojo/edk/embedder/embedder.h" // nogncheck
+#include "mojo/core/embedder/embedder.h" // nogncheck
#include "services/service_manager/public/cpp/service.h" // nogncheck
#include "services/service_manager/public/cpp/test/test_connector_factory.h" // nogncheck
#include "ui/ozone/public/ozone_platform.h"
@@ -117,7 +117,7 @@
int main(int argc, char** argv) {
#if defined(USE_OZONE)
- mojo::edk::Init();
+ mojo::core::Init();
#endif
GlTestSuite test_suite(argc, argv);
diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn
index 780c0c7..99dce13 100644
--- a/ui/keyboard/BUILD.gn
+++ b/ui/keyboard/BUILD.gn
@@ -157,7 +157,7 @@
":test_support",
"//base",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//testing/gmock",
"//testing/gtest",
"//ui/aura:test_support",
diff --git a/ui/keyboard/test/DEPS b/ui/keyboard/test/DEPS
index 8f43aa8..f812cea 100644
--- a/ui/keyboard/test/DEPS
+++ b/ui/keyboard/test/DEPS
@@ -1,6 +1,6 @@
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
"+ui/gl/test/gl_surface_test_support.h",
]
}
diff --git a/ui/keyboard/test/run_all_unittests.cc b/ui/keyboard/test/run_all_unittests.cc
index 86b10203..749a3e70 100644
--- a/ui/keyboard/test/run_all_unittests.cc
+++ b/ui/keyboard/test/run_all_unittests.cc
@@ -8,7 +8,7 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h"
#include "ui/base/resource/resource_bundle.h"
@@ -50,7 +50,7 @@
int main(int argc, char** argv) {
KeyboardTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(
argc, argv,
diff --git a/ui/latency/BUILD.gn b/ui/latency/BUILD.gn
index 28f05e7..6afee94 100644
--- a/ui/latency/BUILD.gn
+++ b/ui/latency/BUILD.gn
@@ -64,7 +64,7 @@
":latency",
"//base",
"//base/test:test_support",
- "//mojo/edk/test:run_all_unittests",
+ "//mojo/core/test:run_all_unittests",
"//testing/gmock",
"//testing/gtest",
]
@@ -95,7 +95,7 @@
":latency",
"//base",
"//base/test:test_support",
- "//mojo/edk/test:run_all_unittests",
+ "//mojo/core/test:run_all_unittests",
"//testing/gmock",
"//testing/gtest",
"//testing/perf",
diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn
index 29764da5..1092359 100644
--- a/ui/message_center/BUILD.gn
+++ b/ui/message_center/BUILD.gn
@@ -209,7 +209,7 @@
":test_support",
"//base",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gmock",
"//testing/gtest",
@@ -236,7 +236,7 @@
if (is_chromeos) {
sources += [ "public/mojo/struct_traits_unittest.cc" ]
deps += [
- "//mojo/edk",
+ "//mojo/core/embedder",
"//ui/message_center/public/mojo:test_interfaces",
]
}
diff --git a/ui/message_center/test/DEPS b/ui/message_center/test/DEPS
index 35b8a8e..43c74c9 100644
--- a/ui/message_center/test/DEPS
+++ b/ui/message_center/test/DEPS
@@ -1,4 +1,4 @@
include_rules = [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
"+ui/gl/test/gl_surface_test_support.h", # To initialize GL for tests.
]
diff --git a/ui/message_center/test/run_all_unittests.cc b/ui/message_center/test/run_all_unittests.cc
index 347c71d..2d9c832 100644
--- a/ui/message_center/test/run_all_unittests.cc
+++ b/ui/message_center/test/run_all_unittests.cc
@@ -10,7 +10,7 @@
#include "base/test/test_discardable_memory_allocator.h"
#include "base/test/test_suite.h"
#include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
@@ -60,7 +60,7 @@
int main(int argc, char** argv) {
MessageCenterTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(argc, argv,
base::BindOnce(&MessageCenterTestSuite::Run,
diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index f12912ef..3363568 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -206,7 +206,7 @@
configs += [ "//build/config:precompiled_headers" ]
deps = [
- "//mojo/edk/test:run_all_unittests",
+ "//mojo/core/test:run_all_unittests",
"//mojo/public/cpp/bindings",
"//testing/gmock",
"//testing/gtest",
diff --git a/ui/ozone/DEPS b/ui/ozone/DEPS
index 96d5d9eb..261e887 100644
--- a/ui/ozone/DEPS
+++ b/ui/ozone/DEPS
@@ -13,6 +13,6 @@
]
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder/embedder.h",
+ "+mojo/core/embedder/embedder.h",
],
}
diff --git a/ui/snapshot/BUILD.gn b/ui/snapshot/BUILD.gn
index 840df0e7..5ceaabc 100644
--- a/ui/snapshot/BUILD.gn
+++ b/ui/snapshot/BUILD.gn
@@ -100,7 +100,7 @@
":snapshot",
"//base",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gtest",
"//ui/base",
diff --git a/ui/snapshot/test/DEPS b/ui/snapshot/test/DEPS
index 101f832..e3fd4c76e 100644
--- a/ui/snapshot/test/DEPS
+++ b/ui/snapshot/test/DEPS
@@ -1,5 +1,5 @@
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
}
diff --git a/ui/snapshot/test/run_all_unittests.cc b/ui/snapshot/test/run_all_unittests.cc
index 2ffcecb..9c1aceb 100644
--- a/ui/snapshot/test/run_all_unittests.cc
+++ b/ui/snapshot/test/run_all_unittests.cc
@@ -5,11 +5,11 @@
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/compositor/test/test_suite.h"
int main(int argc, char** argv) {
- mojo::edk::Init();
+ mojo::core::Init();
#if defined(USE_AURA)
ui::test::CompositorTestSuite test_suite(argc, argv);
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 6826f027..97566fb 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -831,7 +831,7 @@
"//base/test:test_support",
"//gpu/ipc/service",
"//ipc:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gtest",
"//ui/base",
@@ -1147,7 +1147,7 @@
deps = [
":views_unittests_sources",
- "//mojo/edk",
+ "//mojo/core/embedder",
]
}
@@ -1165,7 +1165,7 @@
":views",
"//base",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gtest",
"//ui/base:test_support",
@@ -1224,7 +1224,7 @@
":test_support",
"//base/test:test_support",
"//cc/base:base",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//testing/perf",
"//ui/resources:ui_test_pak",
]
diff --git a/ui/views/DEPS b/ui/views/DEPS
index e6f8d86..39d2ec7 100644
--- a/ui/views/DEPS
+++ b/ui/views/DEPS
@@ -31,10 +31,10 @@
"+ui/wm/test"
],
"run_all_unittests_main\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
],
"views_perftests\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
],
"view_unittest\.cc": [
"+cc/playback"
diff --git a/ui/views/accessibility/DEPS b/ui/views/accessibility/DEPS
index 62e6a66..35ddbecf 100644
--- a/ui/views/accessibility/DEPS
+++ b/ui/views/accessibility/DEPS
@@ -4,6 +4,6 @@
specific_include_rules = {
"ax_system_caret_win_interactive_uitest\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
}
diff --git a/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc b/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc
index d3821559..84b893f 100644
--- a/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc
+++ b/ui/views/accessibility/ax_system_caret_win_interactive_uitest.cc
@@ -10,7 +10,7 @@
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_variant.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
@@ -36,7 +36,7 @@
~AXSystemCaretWinTest() override {}
void SetUp() override {
- mojo::edk::Init();
+ mojo::core::Init();
gl::GLSurfaceTestSupport::InitializeOneOff();
ui::RegisterPathProvider();
base::FilePath ui_test_pak_path;
diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn
index 71b465e..f9b1fe38 100644
--- a/ui/views/mus/BUILD.gn
+++ b/ui/views/mus/BUILD.gn
@@ -122,7 +122,7 @@
":mus",
"//base",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//services/catalog:lib",
"//services/service_manager/background:lib",
"//services/service_manager/public/cpp",
@@ -248,7 +248,7 @@
":mus",
":test_support",
"//base",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//testing/gmock",
"//testing/gtest",
"//ui/aura",
diff --git a/ui/views/mus/DEPS b/ui/views/mus/DEPS
index 333b7ca..8953b55 100644
--- a/ui/views/mus/DEPS
+++ b/ui/views/mus/DEPS
@@ -3,7 +3,7 @@
"+components/gpu",
"+mojo/cc",
"+mojo/converters",
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
"+mojo/public",
"+services/catalog",
"+services/service_manager/public",
diff --git a/ui/views/mus/views_mus_test_suite.cc b/ui/views/mus/views_mus_test_suite.cc
index 304d7625..aee90802 100644
--- a/ui/views/mus/views_mus_test_suite.cc
+++ b/ui/views/mus/views_mus_test_suite.cc
@@ -15,8 +15,8 @@
#include "base/synchronization/waitable_event.h"
#include "base/threading/simple_thread.h"
#include "base/threading/thread.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "mojo/core/embedder/embedder.h"
+#include "mojo/core/embedder/scoped_ipc_support.h"
#include "services/catalog/catalog.h"
#include "services/service_manager/background/background_service_manager.h"
#include "services/service_manager/public/cpp/connector.h"
@@ -72,12 +72,12 @@
ipc_thread_("IPC thread") {
catalog::Catalog::LoadDefaultCatalogManifest(
base::FilePath(kCatalogFilename));
- mojo::edk::Init();
+ mojo::core::Init();
ipc_thread_.StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
- ipc_support_ = std::make_unique<mojo::edk::ScopedIPCSupport>(
+ ipc_support_ = std::make_unique<mojo::core::ScopedIPCSupport>(
ipc_thread_.task_runner(),
- mojo::edk::ScopedIPCSupport::ShutdownPolicy::CLEAN);
+ mojo::core::ScopedIPCSupport::ShutdownPolicy::CLEAN);
base::WaitableEvent wait(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED);
@@ -162,7 +162,7 @@
base::Thread thread_;
base::Thread ipc_thread_;
- std::unique_ptr<mojo::edk::ScopedIPCSupport> ipc_support_;
+ std::unique_ptr<mojo::core::ScopedIPCSupport> ipc_support_;
std::unique_ptr<service_manager::BackgroundServiceManager>
background_service_manager_;
std::unique_ptr<service_manager::ServiceContext> context_;
diff --git a/ui/views/run_all_unittests_main.cc b/ui/views/run_all_unittests_main.cc
index 51d21871..5e781047 100644
--- a/ui/views/run_all_unittests_main.cc
+++ b/ui/views/run_all_unittests_main.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/views/views_test_suite.h"
int main(int argc, char** argv) {
- mojo::edk::Init();
+ mojo::core::Init();
return views::ViewsTestSuite(argc, argv).RunTests();
}
diff --git a/ui/views/test/DEPS b/ui/views/test/DEPS
index ec5862e..d47da7cf 100644
--- a/ui/views/test/DEPS
+++ b/ui/views/test/DEPS
@@ -4,6 +4,6 @@
specific_include_rules = {
"views_interactive_ui_test_base\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
}
diff --git a/ui/views/test/views_interactive_ui_test_base.cc b/ui/views/test/views_interactive_ui_test_base.cc
index cb8aa01..eb9377c 100644
--- a/ui/views/test/views_interactive_ui_test_base.cc
+++ b/ui/views/test/views_interactive_ui_test_base.cc
@@ -5,7 +5,7 @@
#include "ui/views/test/views_interactive_ui_test_base.h"
#include "base/path_service.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/gl/test/gl_surface_test_support.h"
@@ -21,7 +21,7 @@
// Mojo is initialized here similar to how each browser test case initializes
// Mojo when starting. This only works because each interactive_ui_test runs
// in a new process.
- mojo::edk::Init();
+ mojo::core::Init();
gl::GLSurfaceTestSupport::InitializeOneOff();
ui::RegisterPathProvider();
diff --git a/ui/views/views_perftests.cc b/ui/views/views_perftests.cc
index 6740c88..3e06f18 100644
--- a/ui/views/views_perftests.cc
+++ b/ui/views/views_perftests.cc
@@ -3,12 +3,12 @@
// found in the LICENSE file.
#include "base/test/launcher/unit_test_launcher.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/views/views_test_suite.h"
int main(int argc, char** argv) {
views::ViewsTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTestsSerially(
argc, argv,
base::BindOnce(&views::ViewsTestSuite::Run,
diff --git a/ui/views/widget/DEPS b/ui/views/widget/DEPS
index 74d84ca..a244cf72 100644
--- a/ui/views/widget/DEPS
+++ b/ui/views/widget/DEPS
@@ -1,5 +1,5 @@
specific_include_rules = {
"widget_interactive_uitest\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
}
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 83093ff..01e8570 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -16,7 +16,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "base/win/windows_version.h"
#include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "ui/base/ime/input_method.h"
#include "ui/base/ime/text_input_client.h"
#include "ui/base/resource/resource_bundle.h"
@@ -281,7 +281,7 @@
// Mojo is initialized here similar to how each browser test case
// initializes Mojo when starting. This only works because each
// interactive_ui_test runs in a new process.
- mojo::edk::Init();
+ mojo::core::Init();
gl::GLSurfaceTestSupport::InitializeOneOff();
ui::RegisterPathProvider();
diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
index f833d4c..bea3a4e2 100644
--- a/ui/wm/BUILD.gn
+++ b/ui/wm/BUILD.gn
@@ -145,7 +145,7 @@
":wm",
"//base",
"//base/test:test_support",
- "//mojo/edk",
+ "//mojo/core/embedder",
"//skia",
"//testing/gtest",
"//ui/aura:test_support",
diff --git a/ui/wm/test/DEPS b/ui/wm/test/DEPS
index e6b51d4..72e640ce 100644
--- a/ui/wm/test/DEPS
+++ b/ui/wm/test/DEPS
@@ -11,6 +11,6 @@
specific_include_rules = {
"run_all_unittests\.cc": [
- "+mojo/edk/embedder",
+ "+mojo/core/embedder",
]
}
diff --git a/ui/wm/test/run_all_unittests.cc b/ui/wm/test/run_all_unittests.cc
index 445f963..5d3bb4e 100644
--- a/ui/wm/test/run_all_unittests.cc
+++ b/ui/wm/test/run_all_unittests.cc
@@ -11,7 +11,7 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_discardable_memory_allocator.h"
#include "base/test/test_suite.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h"
#include "ui/base/resource/resource_bundle.h"
@@ -53,7 +53,7 @@
int main(int argc, char** argv) {
WMTestSuite test_suite(argc, argv);
- mojo::edk::Init();
+ mojo::core::Init();
return base::LaunchUnitTests(
argc, argv,