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

services/nacl/nonsfi/content_handler_main_nexe.cc

Index: services/nacl/nonsfi/content_handler_main_nexe.cc
diff --git a/services/nacl/nonsfi/content_handler_main_nexe.cc b/services/nacl/nonsfi/content_handler_main_nexe.cc
index 9701bbd248512d8057a42ba79e0cc0da745a324e..07e2c9ae43d4e2f10fefb53d1d0fe7d2d811c758 100644
--- a/services/nacl/nonsfi/content_handler_main_nexe.cc
+++ b/services/nacl/nonsfi/content_handler_main_nexe.cc
@@ -8,6 +8,7 @@
 #include "base/message_loop/message_loop.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/message_pump/message_pump_mojo.h"
 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h"
 #include "mojo/public/c/system/main.h"
@@ -61,6 +62,7 @@ class NaClContentHandler : public mojo::ApplicationImplBase,
 }  // namespace nacl
 
 MojoResult MojoMain(MojoHandle application_request) {
+  mojo::ScopedChromiumInit init;
   nacl::content_handler::NaClContentHandler nacl_content_handler;
-  return mojo::RunMainApplication(application_request, &nacl_content_handler);
+  return mojo::RunApplication(application_request, &nacl_content_handler);
 }