Get rid of {Run,Terminate}MainApplication(), and more ApplicationDelegate conversion.

services/nacl/nonsfi/content_handler_main_pexe.cc

Index: services/nacl/nonsfi/content_handler_main_pexe.cc
diff --git a/services/nacl/nonsfi/content_handler_main_pexe.cc b/services/nacl/nonsfi/content_handler_main_pexe.cc
index b9e6f2be78e122446529093d08088241c9dbd0c1..0478eb8fe6acca779b59cda44ed26342b60b331f 100644
--- a/services/nacl/nonsfi/content_handler_main_pexe.cc
+++ b/services/nacl/nonsfi/content_handler_main_pexe.cc
@@ -10,6 +10,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
+#include "mojo/environment/scoped_chromium_init.h"
 #include "mojo/file_utils/file_util.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/nacl/nonsfi/file_util.h"
@@ -162,6 +163,7 @@ class PexeContentHandler : public mojo::ApplicationImplBase,
 }  // namespace nacl
 
 MojoResult MojoMain(MojoHandle application_request) {
+  mojo::ScopedChromiumInit init;
   nacl::content_handler::PexeContentHandler pexe_content_handler;
-  return mojo::RunMainApplication(application_request, &pexe_content_handler);
+  return mojo::RunApplication(application_request, &pexe_content_handler);
 }