[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}

3 files changed, 8 insertions, 12 deletions

diff --git a/mash/example/window_type_launcher/BUILD.gn b/mash/example/window_type_launcher/BUILD.gn
index d05b7e6..9a4c4d3 100644
--- a/mash/example/window_type_launcher/BUILD.gn
+++ b/mash/example/window_type_launcher/BUILD.gn
@@ -26,6 +26,7 @@ executable("window_type_launcher") {
     "//mash/shell/public/interfaces",
     "//mojo/common:common_base",
     "//mojo/converters/geometry",
+    "//mojo/edk/system",
     "//mojo/message_pump",
     "//mojo/public/cpp/bindings",
     "//mojo/shell/public/cpp",
@@ -33,7 +34,6 @@ executable("window_type_launcher") {
     "//mojo/shell/runner:init",
     "//mojo/shell/runner/child:lib",
     "//skia",
-    "//third_party/mojo/src/mojo/edk/system",
     "//ui/aura",
     "//ui/gfx",
     "//ui/gfx/geometry",
diff --git a/mash/example/window_type_launcher/DEPS b/mash/example/window_type_launcher/DEPS
index 68bd975..9b87a7d 100644
--- a/mash/example/window_type_launcher/DEPS
+++ b/mash/example/window_type_launcher/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
+  "+mojo/edk/embedder",
   "+mojo/message_pump",
   "+mojo/runner",
-  "+third_party/mojo/src/mojo/edk/embedder",
 ]
diff --git a/mash/example/window_type_launcher/main.cc b/mash/example/window_type_launcher/main.cc
index 289b56c..f41e6bc 100644
--- a/mash/example/window_type_launcher/main.cc
+++ b/mash/example/window_type_launcher/main.cc
@@ -14,17 +14,17 @@
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "mash/example/window_type_launcher/window_type_launcher.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
 #include "mojo/shell/runner/child/runner_connection.h"
 #include "mojo/shell/runner/init.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
 
 namespace {
 
-class ProcessDelegate : public mojo::embedder::ProcessDelegate {
+class ProcessDelegate : public mojo::edk::ProcessDelegate {
  public:
   ProcessDelegate() {}
   ~ProcessDelegate() override {}
@@ -52,18 +52,14 @@ int main(int argc, char** argv) {
 #endif
 
   {
-    mojo::embedder::PreInitializeChildProcess();
-    mojo::embedder::Init();
+    mojo::edk::Init();
 
     ProcessDelegate process_delegate;
     base::Thread io_thread("io_thread");
     base::Thread::Options io_thread_options(base::MessageLoop::TYPE_IO, 0);
     CHECK(io_thread.StartWithOptions(io_thread_options));
 
-    mojo::embedder::InitIPCSupport(mojo::embedder::ProcessType::NONE,
-                                   &process_delegate,
-                                   io_thread.task_runner().get(),
-                                   mojo::embedder::ScopedPlatformHandle());
+    mojo::edk::InitIPCSupport(&process_delegate, io_thread.task_runner().get());
 
     mojo::ShellClientRequest request;
     scoped_ptr<mojo::shell::RunnerConnection> connection(
@@ -74,7 +70,7 @@ int main(int argc, char** argv) {
     mojo::ShellConnection impl(&delegate, std::move(request));
     loop.Run();
 
-    mojo::embedder::ShutdownIPCSupport();
+    mojo::edk::ShutdownIPCSupport();
   }
 
   return 0;