MojoMain() -> ServiceMain()

services/shell/tests/connect/connect_test_singleton_app.cc

 // Copyright 2016 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/public/c/system/main.h"
+#include "services/shell/public/c/main.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/service_runner.h"
 
 namespace shell {
 
 class ConnectTestSingletonApp : public Service {
  public:
   ConnectTestSingletonApp() {}
   ~ConnectTestSingletonApp() override {}
 
  private:
   // shell::Service:
   bool OnConnect(Connection* connection) override {
     return true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(ConnectTestSingletonApp);
 };
 
 }  // namespace shell
 
 
-MojoResult MojoMain(MojoHandle shell_handle) {
-  return shell::ServiceRunner(new shell::ConnectTestSingletonApp)
-      .Run(shell_handle);
+MojoResult ServiceMain(MojoHandle service_request_handle) {
+  shell::ServiceRunner runner(new shell::ConnectTestSingletonApp);
+  return runner.Run(service_request_handle);
 }