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

services/device_info/device_info.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 <stdlib.h>
 
 #include "mojo/common/binding_set.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/run_application.h"
@@ skipping 28 matching lines @@
  private:
   mojo::BindingSet<mojo::DeviceInfo> binding_;
 };
 
 }  // namespace device_info
 }  // namespace services
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::services::device_info::DeviceInfoApp device_info_app;
-  return mojo::RunMainApplication(application_request, &device_info_app);
+  return mojo::RunApplication(application_request, &device_info_app);
 }