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

services/nacl/nonsfi/content_handler_main_pexe.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <fcntl.h>
 
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/sha1.h"
 #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"
 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/synchronous_interface_ptr.h"
@@ skipping 132 matching lines @@
   mojo::SynchronousInterfacePtr<mojo::nacl::PexeCompilerInit> compiler_init_;
   mojo::SynchronousInterfacePtr<mojo::nacl::PexeLinkerInit> linker_init_;
 
   DISALLOW_COPY_AND_ASSIGN(PexeContentHandler);
 };
 
 }  // namespace content_handler
 }  // 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);
 }