MojoMain() -> ServiceMain()

mash/catalog_viewer/main.cc

Index: mash/catalog_viewer/main.cc
diff --git a/mash/catalog_viewer/main.cc b/mash/catalog_viewer/main.cc
index 8ee30bc6686efb90870efbce92369db96b278495..f4202e6713912e9519ec649648f219d9c82a6b62 100644
--- a/mash/catalog_viewer/main.cc
+++ b/mash/catalog_viewer/main.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "mash/catalog_viewer/catalog_viewer.h"
-#include "mojo/public/c/system/main.h"
+#include "services/shell/public/c/main.h"
 #include "services/shell/public/cpp/service_runner.h"
 
-MojoResult MojoMain(MojoHandle shell_handle) {
+MojoResult ServiceMain(MojoHandle service_request_handle) {
   shell::ServiceRunner runner(new mash::catalog_viewer::CatalogViewer);
-  return runner.Run(shell_handle);
+  return runner.Run(service_request_handle);
 }