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

services/http_server/http_server_app.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 <memory>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
@@ skipping 23 matching lines @@
     return true;
   }
 
   std::unique_ptr<HttpServerFactoryImpl> http_server_factory_;
 };
 
 }  // namespace http_server
 
 MojoResult MojoMain(MojoHandle application_request) {
   http_server::HttpServerApp http_server_app;
-  return mojo::RunMainApplication(application_request, &http_server_app);
+  return mojo::RunApplication(application_request, &http_server_app);
 }