Revert of Build services as standalone executables

services/service_manager/tests/connect/connect_test_exe.cc

Index: services/service_manager/tests/connect/connect_test_exe.cc
diff --git a/services/service_manager/tests/connect/connect_test_exe.cc b/services/service_manager/tests/connect/connect_test_exe.cc
index 128eacd844b51a4f4989b24b5e21f417223695f1..60de89e968bbbe07facbff43878b68a472895c9b 100644
--- a/services/service_manager/tests/connect/connect_test_exe.cc
+++ b/services/service_manager/tests/connect/connect_test_exe.cc
@@ -2,17 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <memory>
-
+#include "base/at_exit.h"
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
-#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/runner/child/test_native_main.h"
+#include "services/service_manager/runner/init.h"
 #include "services/service_manager/tests/connect/connect_test.mojom.h"
 
 using service_manager::test::mojom::ConnectTestService;
@@ -45,7 +47,6 @@
   void GetTitle(const GetTitleCallback& callback) override {
     callback.Run("connect_test_exe");
   }
-
   void GetInstance(const GetInstanceCallback& callback) override {
     callback.Run(context()->identity().instance());
   }
@@ -55,9 +56,12 @@
   DISALLOW_COPY_AND_ASSIGN(Target);
 };
 
-}  // namespac
+}  // namespace
 
-MojoResult ServiceMain(MojoHandle service_request_handle) {
-  service_manager::ServiceRunner runner(new Target);
-  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<Target>());
 }