From 8934cbcdadac653c36ea3b583d17c11989d60bf9 Mon Sep 17 00:00:00 2001 From: Ken Rockot Date: Wed, 4 Jul 2018 22:08:10 +0000 Subject: [PATCH] Mojo EDK -> Core: Misc top-levels Moves all remaining dependencies from mojo/edk to mojo/core, covering the top-levels that had relatively few dependencies to begin with. All mechanical changes, hence TBR(s). TBR=rkc@chromium.org TBR=rogerta@chromium.org TBR=sunnyps@chromium.org TBR=mmenke@chromium.org TBR=bbudge@chromium.org TBR=fmalita@chromium.org TBR=tsepez@chromium.org TBR=peria@chromium.org TBR=dcheng@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:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I4961ea707383e161d4b8f2c0de8341c0010b4485 Reviewed-on: https://chromium-review.googlesource.com/1126418 Commit-Queue: Ken Rockot Reviewed-by: Ken Rockot Cr-Original-Commit-Position: refs/heads/master@{#572665} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: f03d97c950d2d58aa7055d3ddcb40ec432bb39a7 --- BUILD.gn | 2 +- DEPS | 2 +- run_all_unittests.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 7bdcab4..57bbe16 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -168,7 +168,7 @@ test("url_unittests") { if (!is_ios) { deps += [ - "//mojo/edk", + "//mojo/core/embedder", "//url/mojom:test_url_mojom_gurl", ] } diff --git a/DEPS b/DEPS index 9591925..c43ecab 100644 --- a/DEPS +++ b/DEPS @@ -14,6 +14,6 @@ specific_include_rules = { "+third_party/icu", ], "run_all_unittests\.cc": [ - "+mojo/edk/embedder", + "+mojo/core/embedder", ], } diff --git a/run_all_unittests.cc b/run_all_unittests.cc index 02732cc..0a97211 100644 --- a/run_all_unittests.cc +++ b/run_all_unittests.cc @@ -11,14 +11,14 @@ #include "build/build_config.h" #if !defined(OS_IOS) -#include "mojo/edk/embedder/embedder.h" // nogncheck +#include "mojo/core/embedder/embedder.h" // nogncheck #endif int main(int argc, char** argv) { base::TestSuite test_suite(argc, argv); #if !defined(OS_IOS) - mojo::edk::Init(); + mojo::core::Init(); #endif return base::LaunchUnitTests(