Stop linking in the old Mojo EDK.

mojo/runner/child/test_native_main.cc

Index: mojo/runner/child/test_native_main.cc
diff --git a/mojo/runner/child/test_native_main.cc b/mojo/runner/child/test_native_main.cc
index 85248b60ff2c6907fc747927baa9be0e38192293..1579e1b7c409e4c326e27a29098f7fc1560f7cde 100644
--- a/mojo/runner/child/test_native_main.cc
+++ b/mojo/runner/child/test_native_main.cc
@@ -12,19 +12,19 @@
 #include "base/process/launch.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/runner/child/runner_connection.h"
 #include "mojo/runner/init.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/application_impl.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
 
 namespace mojo {
 namespace runner {
 namespace {
 
-class ProcessDelegate : public mojo::embedder::ProcessDelegate {
+class ProcessDelegate : public edk::ProcessDelegate {
  public:
   ProcessDelegate() {}
   ~ProcessDelegate() override {}
@@ -37,8 +37,8 @@ class ProcessDelegate : public mojo::embedder::ProcessDelegate {
 
 }  // namespace
 
-int TestNativeMain(mojo::ApplicationDelegate* application_delegate) {
-  mojo::runner::WaitForDebuggerIfNecessary();
+int TestNativeMain(ApplicationDelegate* application_delegate) {
+  runner::WaitForDebuggerIfNecessary();
 
 #if !defined(OFFICIAL_BUILD)
   base::debug::EnableInProcessStackDumping();
@@ -48,28 +48,25 @@ int TestNativeMain(mojo::ApplicationDelegate* application_delegate) {
 #endif
 
   {
-    mojo::embedder::PreInitializeChildProcess();
-    mojo::embedder::Init();
+    edk::PreInitializeChildProcess();
+    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());
+    edk::InitIPCSupport(&process_delegate, io_thread.task_runner().get());
 
-    mojo::InterfaceRequest<mojo::Application> application_request;
-    scoped_ptr<mojo::runner::RunnerConnection> connection(
-        mojo::runner::RunnerConnection::ConnectToRunner(
+    InterfaceRequest<Application> application_request;
+    scoped_ptr<runner::RunnerConnection> connection(
+        runner::RunnerConnection::ConnectToRunner(
             &application_request, ScopedMessagePipeHandle()));
-    base::MessageLoop loop(mojo::common::MessagePumpMojo::Create());
-    mojo::ApplicationImpl impl(application_delegate,
-                               std::move(application_request));
+    base::MessageLoop loop(common::MessagePumpMojo::Create());
+    ApplicationImpl impl(application_delegate, std::move(application_request));
     loop.Run();
 
-    mojo::embedder::ShutdownIPCSupport();
+    edk::ShutdownIPCSupport();
   }
 
   return 0;