Misc service_manager and service test cleanup

services/ui/common/run_all_service_tests.cc

Index: services/ui/common/run_all_service_tests.cc
diff --git a/services/ui/common/run_all_service_tests.cc b/services/ui/common/run_all_service_tests.cc
index 1bdba53eb11a12c7b9dd3bb764eddb386878fdcc..673812fb71eed8b2ed2e1b351fa19cb6c3ec01f0 100644
--- a/services/ui/common/run_all_service_tests.cc
+++ b/services/ui/common/run_all_service_tests.cc
@@ -6,7 +6,6 @@
 #include "base/test/test_suite.h"
 #include "build/build_config.h"
 #include "mojo/edk/embedder/embedder.h"
-#include "services/service_manager/background/background_service_manager_main.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"
@@ -27,7 +26,7 @@ class MusGpuTestSuite : public base::TestSuite {
   }
 };
 
-int MasterProcessMain(int argc, char** argv) {
+int main(int argc, char** argv) {
   MusGpuTestSuite test_suite(argc, argv);
   mojo::edk::Init();
   return base::LaunchUnitTests(