Stop linking in the old Mojo EDK.

mojo/edk/embedder/embedder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/embedder/embedder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
-
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/task_runner.h"
 #include "mojo/edk/embedder/embedder_internal.h"
@@ skipping 14 matching lines @@
 namespace internal {
 
 // Declared in embedder_internal.h.
 Broker* g_broker = nullptr;
 PlatformSupport* g_platform_support = nullptr;
 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) {
   GetMutableConfiguration()->max_message_num_bytes = bytes;
 }
 
 void PreInitializeParentProcess() {
   BrokerState::GetInstance();
 }
 
@@ skipping 10 matching lines @@
 void ChildProcessLaunched(base::ProcessHandle child_process,
                           ScopedPlatformHandle server_pipe) {
   new ChildBrokerHost(child_process, std::move(server_pipe));
 }
 
 void SetParentPipeHandle(ScopedPlatformHandle pipe) {
   ChildBroker::GetInstance()->SetChildBrokerHostHandle(std::move(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);
   internal::g_platform_support = new SimplePlatformSupport();
 
   DCHECK(!internal::g_core);
   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) {
   return internal::g_core->AsyncWait(handle, signals, callback);
 }
 
 MojoResult CreatePlatformHandleWrapper(
     ScopedPlatformHandle platform_handle,
     MojoHandle* platform_handle_wrapper_handle) {
   DCHECK(platform_handle_wrapper_handle);
@@ skipping 60 matching lines @@
   CHECK(rv.is_valid());
   dispatcher->Init(std::move(platform_handle), nullptr, 0, nullptr, 0, nullptr,
                    nullptr);
   // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it
   // once that's fixed.
   return rv;
 }
 
 }  // namespace edk
 }  // namespace mojo