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

mojo/public/cpp/application/lib/run_application.cc

 // Copyright 2016 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 "mojo/public/cpp/application/run_application.h"
 
 #include <assert.h>
 #include <pthread.h>
 
 #include "mojo/public/cpp/application/application_impl_base.h"
@@ skipping 42 matching lines @@
 void SetCurrentResultHolder(ResultHolder* result_holder) {
   InitializeCurrentResultHolderIfNecessary();
 
   int error = pthread_setspecific(g_current_result_holder_key, result_holder);
   MOJO_ALLOW_UNUSED_LOCAL(error);
   assert(!error);
 }
 
 }  // namespace
 
-MojoResult RunMainApplication(MojoHandle application_request_handle,
-                              ApplicationImplBase* application_impl,
-                              const RunApplicationOptions* options) {
-  return RunApplication(application_request_handle, application_impl, options);
-}
-
 MojoResult RunApplication(MojoHandle application_request_handle,
                           ApplicationImplBase* application_impl,
                           const RunApplicationOptions* options) {
   assert(!options);  // No options supported!
   assert(!GetCurrentResultHolder());
 
   ResultHolder result_holder;
   SetCurrentResultHolder(&result_holder);
 
   RunLoop loop;
   application_impl->Bind(InterfaceRequest<Application>(
       MakeScopedHandle(MessagePipeHandle(application_request_handle))));
   loop.Run();
 
   // TODO(vtl): Should we unbind stuff here? (Should there be "will start"/"did
   // stop" notifications to the |ApplicationImplBase|?)
 
   SetCurrentResultHolder(nullptr);
 
   // TODO(vtl): We'd like to enable the following assertion, but we do things
   // like |RunLoop::current()->Quit()| in various places.
   // assert(result_holder.is_set);
 
   return result_holder.result;
 }
 
-void TerminateMainApplication(MojoResult result) {
-  TerminateApplication(result);
-}
-
 void TerminateApplication(MojoResult result) {
   RunLoop::current()->Quit();
 
   ResultHolder* result_holder = GetCurrentResultHolder();
   assert(result_holder);
   assert(!result_holder->is_set);
   result_holder->result = result;
 #ifndef NDEBUG
   result_holder->is_set = true;
 #endif
 }
 
 }  // namespace mojo