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

services/prediction/prediction_service_impl.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 "services/prediction/prediction_service_impl.h"
 
+#include "mojo/environment/scoped_chromium_init.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"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 
 namespace prediction {
 
 PredictionServiceImpl::PredictionServiceImpl(
     mojo::InterfaceRequest<PredictionService> request)
     : strong_binding_(this, request.Pass()) {
@@ skipping 28 matching lines @@
         mojo::InterfaceRequest<PredictionService> prediction_service_request) {
       new PredictionServiceImpl(prediction_service_request.Pass());
     });
     return true;
   }
 };
 
 }  // namespace prediction
 
 MojoResult MojoMain(MojoHandle application_request) {
+  mojo::ScopedChromiumInit init;
   prediction::PredictionServiceApp prediction_service_app;
-  return mojo::RunMainApplication(application_request, &prediction_service_app);
+  return mojo::RunApplication(application_request, &prediction_service_app);
 }