MojoMain() -> ServiceMain()

services/shell/tests/connect/connect_test_app.cc

Index: services/shell/tests/connect/connect_test_app.cc
diff --git a/services/shell/tests/connect/connect_test_app.cc b/services/shell/tests/connect/connect_test_app.cc
index c0545b74e107abdcb506dcc17d67a8e5901303a0..6e131ee3adef6cc558897aa4ecf0083bd5adb59c 100644
--- a/services/shell/tests/connect/connect_test_app.cc
+++ b/services/shell/tests/connect/connect_test_app.cc
@@ -9,8 +9,8 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "services/shell/public/c/main.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/service.h"
@@ -217,8 +217,7 @@ class ConnectTestApp : public Service,
 
 }  // namespace shell
 
-MojoResult MojoMain(MojoHandle shell_handle) {
-  MojoResult rv =
-      shell::ServiceRunner(new shell::ConnectTestApp).Run(shell_handle);
-  return rv;
+MojoResult ServiceMain(MojoHandle service_request_handle) {
+  shell::ServiceRunner runner(new shell::ConnectTestApp);
+  return runner.Run(service_request_handle);
 }