Stop linking in the old Mojo EDK.

mojo/runner/context.cc

Index: mojo/runner/context.cc
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index 657d99ae228a99253c222382924d6dc903b964fc..18df95da0f7591f5b14c165a0cb297243d86bb53 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -28,6 +28,7 @@
 #include "components/devtools_service/public/cpp/switches.h"
 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h"
 #include "components/tracing/tracing_switches.h"
+#include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/runner/host/in_process_native_runner.h"
 #include "mojo/runner/host/out_of_process_native_runner.h"
@@ -47,7 +48,6 @@
 #include "mojo/shell/query_util.h"
 #include "mojo/shell/switches.h"
 #include "mojo/util/filename_util.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "url/gurl.h"
 
 namespace mojo {
@@ -58,8 +58,8 @@ namespace {
 class Setup {
  public:
   Setup() {
-    embedder::PreInitializeParentProcess();
-    embedder::Init();
+    edk::PreInitializeParentProcess();
+    edk::Init();
   }
 
   ~Setup() {}
@@ -212,10 +212,7 @@ bool Context::Init(const base::FilePath& shell_file_root) {
   task_runners_.reset(
       new TaskRunners(base::MessageLoop::current()->task_runner()));
 
-  // TODO(vtl): This should be MASTER, not NONE.
-  embedder::InitIPCSupport(embedder::ProcessType::NONE, this,
-                           task_runners_->io_runner(),
-                           embedder::ScopedPlatformHandle());
+  edk::InitIPCSupport(this, task_runners_->io_runner());
 
   package_manager_ = new shell::PackageManagerImpl(
       shell_file_root, task_runners_->blocking_pool());
@@ -293,7 +290,7 @@ void Context::Shutdown() {
             task_runners_->shell_runner());
   // Post a task in case OnShutdownComplete is called synchronously.
   base::MessageLoop::current()->PostTask(
-      FROM_HERE, base::Bind(embedder::ShutdownIPCSupport));
+      FROM_HERE, base::Bind(edk::ShutdownIPCSupport));
   // We'll quit when we get OnShutdownComplete().
   base::MessageLoop::current()->Run();
 }