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

examples/content_handler_demo/content_handler_demo.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 <stdio.h>
 
 #include <utility>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl_base.h"
@@ skipping 96 matching lines @@
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(ContentHandlerApp);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::examples::ContentHandlerApp content_handler_app;
-  return mojo::RunMainApplication(application_request, &content_handler_app);
+  return mojo::RunApplication(application_request, &content_handler_app);
 }