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

examples/echo/echo_server.cc

 // Copyright 2014 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 "examples/echo/echo.mojom.h"
 #include "mojo/common/binding_set.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl_base.h"
@@ skipping 107 matching lines @@
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
   // Uncomment one of the three servers at a time to see it work:
   mojo::examples::MultiServer server_app;
   // mojo::examples::SingletonServer server_app;
   // mojo::examples::OneAtATimeServer server_app;
-  return mojo::RunMainApplication(application_request, &server_app);
+  return mojo::RunApplication(application_request, &server_app);
 }