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

services/nacl/sfi/content_handler_main.cc

Index: services/nacl/sfi/content_handler_main.cc
diff --git a/services/nacl/sfi/content_handler_main.cc b/services/nacl/sfi/content_handler_main.cc
index 35a6fb19f4bb884bf371b5cba9784e6645988e6c..405cf7a26b2ab7c58bd282622180869719d80b00 100644
--- a/services/nacl/sfi/content_handler_main.cc
+++ b/services/nacl/sfi/content_handler_main.cc
@@ -8,6 +8,7 @@
 #include "build/build_config.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/sfi/nacl_bindings/monacl_sel_main.h"
 #include "mojo/public/c/system/main.h"
@@ -150,6 +151,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);
 }