Stop linking in the old Mojo EDK.

mojo/edk/embedder/embedder.cc

Index: mojo/edk/embedder/embedder.cc
diff --git a/mojo/edk/embedder/embedder.cc b/mojo/edk/embedder/embedder.cc
index 4353f9b3ce51e507a0ced57ac383f01bab976aa5..eff59418f260ad42311b84aa06365f731044470d 100644
--- a/mojo/edk/embedder/embedder.cc
+++ b/mojo/edk/embedder/embedder.cc
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <utility>
-
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -43,10 +42,6 @@ Core* g_core = nullptr;
 ProcessDelegate* g_process_delegate;
 base::TaskRunner* g_io_thread_task_runner = nullptr;
 
-Core* GetCore() {
-  return g_core;
-}
-
 }  // namespace internal
 
 void SetMaxMessageSize(size_t bytes) {
@@ -77,9 +72,7 @@ void SetParentPipeHandle(ScopedPlatformHandle pipe) {
 }
 
 void Init() {
-  const base::CommandLine& command_line =
-      *base::CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch("use-new-edk") && !internal::g_broker)
+  if (!internal::g_broker)
     BrokerState::GetInstance();
 
   DCHECK(!internal::g_platform_support);
@@ -89,6 +82,12 @@ void Init() {
   internal::g_core = new Core(internal::g_platform_support);
 }
 
+void Init(scoped_refptr<base::TaskRunner> io_thread_task_runner) {
+  Init();
+  DCHECK(!internal::g_io_thread_task_runner);
+  internal::g_io_thread_task_runner = io_thread_task_runner.get();
+}
+
 MojoResult AsyncWait(MojoHandle handle,
                      MojoHandleSignals signals,
                      const base::Callback<void(MojoResult)>& callback) {