Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2915)

Unified Diff: mojo/shell/runner/child/test_native_main.cc

Issue 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/shell/runner/child/test_native_main.cc
diff --git a/mojo/shell/runner/child/test_native_main.cc b/mojo/shell/runner/child/test_native_main.cc
index 537b32b68de6f7c419b1ea6bda9822e177cd59b8..278fd7dcf0862d25a203e31a64db4858dd223e56 100644
--- a/mojo/shell/runner/child/test_native_main.cc
+++ b/mojo/shell/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/shell/public/cpp/application_impl.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "mojo/shell/runner/child/runner_connection.h"
#include "mojo/shell/runner/init.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 shell {
namespace {
-class ProcessDelegate : public mojo::embedder::ProcessDelegate {
+class ProcessDelegate : public mojo::edk::ProcessDelegate {
public:
ProcessDelegate() {}
~ProcessDelegate() override {}
@@ -48,17 +48,14 @@ int TestNativeMain(mojo::ShellClient* application_delegate) {
#endif
{
- mojo::embedder::PreInitializeChildProcess();
- mojo::embedder::Init();
+ mojo::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());
+ mojo::edk::InitIPCSupport(&process_delegate, io_thread.task_runner());
mojo::ApplicationRequest application_request;
scoped_ptr<mojo::shell::RunnerConnection> connection(
@@ -69,7 +66,7 @@ int TestNativeMain(mojo::ShellClient* application_delegate) {
std::move(application_request));
loop.Run();
- mojo::embedder::ShutdownIPCSupport();
+ mojo::edk::ShutdownIPCSupport();
}
return 0;

Powered by Google App Engine
This is Rietveld 408576698