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

Unified Diff: components/nacl/loader/nacl_listener.cc

Issue 877993004: Revert "Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | mojo/cc/output_surface_mojo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_listener.cc
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
index 635178ead31f64fe378c2c3819359a349ae5b5b5..ae865f8603f6892366153fe9f72e91feba36b57d 100644
--- a/components/nacl/loader/nacl_listener.cc
+++ b/components/nacl/loader/nacl_listener.cc
@@ -35,7 +35,6 @@
#include "native_client/src/public/nacl_file_info.h"
#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
#include "third_party/mojo/src/mojo/edk/embedder/platform_support.h"
-#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h"
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"
@@ -434,8 +433,7 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
#if !defined(OS_MACOSX)
// Don't call mojo::embedder::Init on Mac; it's already been called from
// ChromeMain() (see chrome/app/chrome_exe_main_mac.cc).
- mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
- new mojo::embedder::SimplePlatformSupport()));
+ mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>());
#endif
// InjectMojo adds a file descriptor to the process that allows Mojo calls
// to use an implementation defined outside the NaCl sandbox. See
« no previous file with comments | « no previous file | mojo/cc/output_surface_mojo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698