Index: mojo/shell/standalone/context.cc |
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc |
index 41a003ff755bf2070e6cf045f032a3ec4eaf6637..8c4d939d088dc2d72e1e4e60fa8475b98f0e4a10 100644 |
--- a/mojo/shell/standalone/context.cc |
+++ b/mojo/shell/standalone/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/services/tracing/public/cpp/switches.h" |
#include "mojo/services/tracing/public/cpp/trace_provider_impl.h" |
@@ -44,7 +45,6 @@ |
#include "mojo/shell/standalone/tracer.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 { |
@@ -54,10 +54,7 @@ namespace { |
// Used to ensure we only init once. |
class Setup { |
public: |
- Setup() { |
- embedder::PreInitializeParentProcess(); |
- embedder::Init(); |
- } |
+ Setup() { edk::Init(); } |
~Setup() {} |
@@ -208,9 +205,7 @@ void Context::Init(const base::FilePath& shell_file_root) { |
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 PackageManagerImpl( |
shell_file_root, task_runners_->blocking_pool(), nullptr); |
@@ -284,8 +279,8 @@ void 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)); |
+ base::MessageLoop::current()->PostTask(FROM_HERE, |
+ base::Bind(edk::ShutdownIPCSupport)); |
// We'll quit when we get OnShutdownComplete(). |
base::MessageLoop::current()->Run(); |
} |