[mojo] Delete third_party/mojo

All users are on the new EDK now. This wipes out third_party/mojo,
updates all dependencies, and removes the use-new-edk flag.

BUG=None

Review URL: https://codereview.chromium.org/1676913002

Cr-Commit-Position: refs/heads/master@{#374631}

13 files changed, 26 insertions, 28 deletions

diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index a624a45..3d97214 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -182,14 +182,14 @@ test("extensions_unittests") {
     "//extensions/renderer",
     "//extensions/strings",
     "//extensions/utility",
+    "//mojo/edk/js",
+    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/shell/public/interfaces",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/leveldatabase",
-    "//third_party/mojo/src/mojo/edk/js",
-    "//third_party/mojo/src/mojo/edk/system",
   ]
 
   data_deps = [
@@ -242,12 +242,12 @@ test("extensions_browsertests") {
     "//device/core:mocks",
     "//device/hid:mocks",
     "//device/usb:mocks",
+    "//mojo/edk/js",
+    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/mojo/src/mojo/edk/js",
-    "//third_party/mojo/src/mojo/edk/system",
   ]
 
   data_deps = [
diff --git a/extensions/common/api/api.gyp b/extensions/common/api/api.gyp
index ea7e4c1..3a2696f 100644
--- a/extensions/common/api/api.gyp
+++ b/extensions/common/api/api.gyp
@@ -12,7 +12,7 @@
       # generated cpp files must be listed explicitly in chrome_api.
       'type': 'none',
       'includes': [
-        '../../../third_party/mojo/mojom_bindings_generator.gypi',
+        '../../../mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'mime_handler.mojom',
@@ -31,7 +31,7 @@
       ],
       'dependencies': [
         'extensions_api_mojom',
-        '../../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/extensions/common/api/mime_handler.mojom.cc',
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 59ee0072..0dda3f7 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -32,7 +32,7 @@
       # generated cpp files must be listed explicitly in extensions_common
       'type': 'none',
       'includes': [
-        '../third_party/mojo/mojom_bindings_generator.gypi',
+        '../mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         '<@(extensions_common_mojo_sources)',
@@ -204,8 +204,8 @@
         '../components/components.gyp:guest_view_renderer',
         '../content/content.gyp:content_resources',
         '../gin/gin.gyp:gin',
+        '../mojo/mojo_public.gyp:mojo_js_bindings',
         '../third_party/WebKit/public/blink.gyp:blink',
-        '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
       ],
       'include_dirs': [
         '..',
diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp
index b4185cd..87ef374 100644
--- a/extensions/extensions_tests.gyp
+++ b/extensions/extensions_tests.gyp
@@ -28,12 +28,12 @@
         '../device/serial/serial.gyp:device_serial_test_util',
         '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
+        '../mojo/mojo_edk.gyp:mojo_js_lib',
+        '../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-        '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
-        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
-        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'common/api/api.gyp:cast_channel_proto',
         'extensions.gyp:extensions_browser',
         'extensions.gyp:extensions_common',
diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn
index 7ed31fe..9606e85 100644
--- a/extensions/renderer/BUILD.gn
+++ b/extensions/renderer/BUILD.gn
@@ -26,9 +26,9 @@ source_set("renderer") {
     "//content:resources",
     "//extensions:extensions_resources",
     "//gin",
+    "//mojo/edk/js",
     "//mojo/public/js",
     "//skia",
     "//third_party/WebKit/public:blink",
-    "//third_party/mojo/src/mojo/edk/js",
   ]
 }
diff --git a/extensions/renderer/DEPS b/extensions/renderer/DEPS
index 5a27869..bd0ed52 100644
--- a/extensions/renderer/DEPS
+++ b/extensions/renderer/DEPS
@@ -4,7 +4,7 @@ include_rules = [
   "+content/public/renderer",
 
   "+gin",
-  "+third_party/mojo/src/mojo/edk/js",
+  "+mojo/edk/js",
 
   "+third_party/skia/include/core",
   "+third_party/cld_2/src/public/compact_lang_det.h",
diff --git a/extensions/renderer/api/serial/data_receiver_unittest.cc b/extensions/renderer/api/serial/data_receiver_unittest.cc
index 126b041..0827a8a 100644
--- a/extensions/renderer/api/serial/data_receiver_unittest.cc
+++ b/extensions/renderer/api/serial/data_receiver_unittest.cc
@@ -14,6 +14,7 @@
 #include "gin/dictionary.h"
 #include "gin/wrappable.h"
 #include "grit/extensions_renderer_resources.h"
+#include "mojo/edk/js/handle.h"
 
 namespace extensions {
 
diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc
index 3ce3d5d..abf868b 100644
--- a/extensions/renderer/api_test_base.cc
+++ b/extensions/renderer/api_test_base.cc
@@ -13,11 +13,11 @@
 #include "extensions/renderer/process_info_native_handler.h"
 #include "gin/converter.h"
 #include "gin/dictionary.h"
+#include "mojo/edk/js/core.h"
+#include "mojo/edk/js/handle.h"
+#include "mojo/edk/js/support.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/core.h"
-#include "third_party/mojo/src/mojo/edk/js/core.h"
-#include "third_party/mojo/src/mojo/edk/js/handle.h"
-#include "third_party/mojo/src/mojo/edk/js/support.h"
 
 namespace extensions {
 namespace {
@@ -155,13 +155,11 @@ void ApiTestEnvironment::RegisterModules() {
       "exports.$set('MatchAgainstEventFilter', function() { return [] });");
 
   gin::ModuleRegistry::From(env()->context()->v8_context())
-      ->AddBuiltinModule(env()->isolate(),
-                         mojo::js::Core::kModuleName,
-                         mojo::js::Core::GetModule(env()->isolate()));
+      ->AddBuiltinModule(env()->isolate(), mojo::edk::js::Core::kModuleName,
+                         mojo::edk::js::Core::GetModule(env()->isolate()));
   gin::ModuleRegistry::From(env()->context()->v8_context())
-      ->AddBuiltinModule(env()->isolate(),
-                         mojo::js::Support::kModuleName,
-                         mojo::js::Support::GetModule(env()->isolate()));
+      ->AddBuiltinModule(env()->isolate(), mojo::edk::js::Support::kModuleName,
+                         mojo::edk::js::Support::GetModule(env()->isolate()));
   gin::Handle<TestServiceProvider> service_provider =
       TestServiceProvider::Create(env()->isolate());
   service_provider_ = service_provider.get();
diff --git a/extensions/renderer/api_test_base.h b/extensions/renderer/api_test_base.h
index 2bfc4cc..8b62049 100644
--- a/extensions/renderer/api_test_base.h
+++ b/extensions/renderer/api_test_base.h
@@ -19,7 +19,6 @@
 #include "gin/wrappable.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/core.h"
-#include "third_party/mojo/src/mojo/edk/js/handle.h"
 
 namespace extensions {
 
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index a98d704..c2f57e9 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -54,10 +54,10 @@ source_set("app_shell_lib") {
     "//extensions/shell/common/api",
     "//extensions/shell/common/api:api_registration",
     "//extensions/utility",
+    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//skia",
     "//third_party/WebKit/public:blink",
-    "//third_party/mojo/src/mojo/edk/system",
     "//ui/base",
     "//ui/base/ime",
     "//v8",
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 695bb32..9d085db 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -47,9 +47,9 @@
         '<(DEPTH)/extensions/shell/browser/api/api_registration.gyp:shell_api_registration',
         '<(DEPTH)/extensions/shell/common/api/api.gyp:shell_api',
         '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
+        '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-        '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl',
         '<(DEPTH)/ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '<(DEPTH)/ui/base/ui_base.gyp:ui_base',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
diff --git a/extensions/test/DEPS b/extensions/test/DEPS
index b334588..27ef4ea 100644
--- a/extensions/test/DEPS
+++ b/extensions/test/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
   "+content/public",
-  "+third_party/mojo/src/mojo/edk/embedder",
+  "+mojo/edk/embedder",
   "+ui/gl",
 ]
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
index ac9e8dd..bb9cc00 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc
@@ -13,7 +13,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/test/test_extensions_client.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/embedder.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 #include "url/url_util.h"
@@ -110,7 +110,7 @@ void ExtensionsTestSuite::Shutdown() {
 int main(int argc, char** argv) {
   content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv));
 
-  mojo::embedder::Init();
+  mojo::edk::Init();
   return base::LaunchUnitTests(argc,
                                argv,
                                base::Bind(&content::UnitTestTestSuite::Run,