Revert of Build services as standalone executables

services/service_manager/public/cpp/service.h

Index: services/service_manager/public/cpp/service.h
diff --git a/services/service_manager/public/cpp/service.h b/services/service_manager/public/cpp/service.h
index b3322b200c10c2b55d60c2e9e5fc18f5c314ff0b..2b8e780d0b815c9bfad0241c168def0431467a70 100644
--- a/services/service_manager/public/cpp/service.h
+++ b/services/service_manager/public/cpp/service.h
@@ -4,8 +4,6 @@
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_H_
-
-#include "base/macros.h"
 
 namespace service_manager {
 
@@ -67,8 +65,6 @@
   void set_context(ServiceContext* context) { service_context_ = context; }
 
   ServiceContext* service_context_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 // TODO(rockot): Remove this. It's here to satisfy a few remaining use cases
@@ -79,16 +75,14 @@
   explicit ForwardingService(Service* target);
   ~ForwardingService() override;
 
+ private:
   // Service:
   void OnStart() override;
   bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override;
   bool OnStop() override;
 
- private:
   Service* const target_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(ForwardingService);
 };
 
 }  // namespace service_manager