Revert of Build services as standalone executables

services/service_manager/tests/lifecycle/lifecycle_exe.cc

Index: services/service_manager/tests/lifecycle/lifecycle_exe.cc
diff --git a/services/service_manager/tests/lifecycle/lifecycle_exe.cc b/services/service_manager/tests/lifecycle/lifecycle_exe.cc
index f5ab4cd7ddcda45a889d6ff8f5ea223ff48f24fc..a7ff9f9e3937c42d87e386e52c417603627d7044 100644
--- a/services/service_manager/tests/lifecycle/lifecycle_exe.cc
+++ b/services/service_manager/tests/lifecycle/lifecycle_exe.cc
@@ -2,11 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "services/service_manager/public/c/main.h"
-#include "services/service_manager/public/cpp/service_runner.h"
+#include "base/at_exit.h"
+#include "base/command_line.h"
+#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/runner/child/test_native_main.h"
+#include "services/service_manager/runner/init.h"
 #include "services/service_manager/tests/lifecycle/app_client.h"
 
-MojoResult ServiceMain(MojoHandle service_request_handle) {
-  service_manager::ServiceRunner runner(new service_manager::test::AppClient);
-  return runner.Run(service_request_handle);
+int main(int argc, char** argv) {
+  base::AtExitManager at_exit;
+  base::CommandLine::Init(argc, argv);
+
+  service_manager::InitializeLogging();
+  return service_manager::TestNativeMain(
+      base::MakeUnique<service_manager::test::AppClient>());
 }