Stop linking in the old Mojo EDK.

mojo/runner/context.cc

 // Copyright 2013 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/runner/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 10 matching lines @@
 #include "base/process/process_info.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #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"
 #include "mojo/runner/register_local_aliases.h"
 #include "mojo/runner/switches.h"
 #include "mojo/runner/tracer.h"
 #include "mojo/services/tracing/public/cpp/switches.h"
 #include "mojo/services/tracing/public/cpp/trace_provider_impl.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
 #include "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #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 {
 namespace runner {
 namespace {
 
 // Used to ensure we only init once.
 class Setup {
  public:
   Setup() {
-    embedder::PreInitializeParentProcess();
-    embedder::Init();
+    edk::PreInitializeParentProcess();
+    edk::Init();
   }
 
   ~Setup() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
 void InitContentHandlers(shell::PackageManagerImpl* manager,
                          const base::CommandLine& command_line) {
@@ skipping 132 matching lines @@
   }
 
   // ICU data is a thing every part of the system needs. This here warms
   // up the copy of ICU in the mojo runner.
   CHECK(base::i18n::InitializeICU());
 
   EnsureEmbedderIsInitialized();
   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());
   InitContentHandlers(package_manager_, command_line);
 
   RegisterLocalAliases(package_manager_);
 
   scoped_ptr<shell::NativeRunnerFactory> runner_factory;
   if (command_line.HasSwitch(switches::kEnableMultiprocess)) {
     runner_factory.reset(
@@ skipping 57 matching lines @@
   // Actions triggered by ApplicationManager's destructor may require a current
   // message loop, so we should destruct it explicitly now as ~Context() occurs
   // post message loop shutdown.
   application_manager_.reset();
 
   TRACE_EVENT0("mojo_shell", "Context::Shutdown");
   DCHECK_EQ(base::MessageLoop::current()->task_runner(),
             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();
 }
 
 void Context::OnShutdownComplete() {
   DCHECK_EQ(base::MessageLoop::current()->task_runner(),
             task_runners_->shell_runner());
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
@@ skipping 40 matching lines @@
         base::MessageLoop::current()->QuitWhenIdle();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo