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

services/keyboard/linux/main.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 "base/macros.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"
 #include "mojo/services/native_viewport/interfaces/native_viewport_event_dispatcher.mojom.h"
 #include "services/keyboard/linux/keyboard_service_impl.h"
 
 namespace keyboard {
 
 class KeyboardServiceFactoryImpl : public keyboard::KeyboardServiceFactory {
@@ skipping 33 matching lines @@
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(KeyboardServiceApp);
 };
 
 }  // namespace keyboard
 
 MojoResult MojoMain(MojoHandle application_request) {
+  mojo::ScopedChromiumInit init;
   keyboard::KeyboardServiceApp keyboard_service_app;
-  return mojo::RunMainApplication(application_request, &keyboard_service_app);
+  return mojo::RunApplication(application_request, &keyboard_service_app);
 }