Make Service own ServiceContext.

services/shell/public/cpp/lib/service.cc

Index: services/shell/public/cpp/lib/service.cc
diff --git a/services/shell/public/cpp/lib/service.cc b/services/shell/public/cpp/lib/service.cc
index 22a167f87fd5d9cac803783afe8c8b036b40aedb..db9eb31d69ff879c190ec8e36be1ac01bfe12ef2 100644
--- a/services/shell/public/cpp/lib/service.cc
+++ b/services/shell/public/cpp/lib/service.cc
@@ -4,14 +4,14 @@
 
 #include "services/shell/public/cpp/service.h"
 
+#include "services/shell/public/cpp/service_context.h"
+
 namespace shell {
 
 Service::Service() {}
 Service::~Service() {}
 
-void Service::OnStart(Connector* connector, const Identity& identity,
-                      uint32_t id) {
-}
+void Service::OnStart(const Identity& identity) {}
 
 bool Service::OnConnect(Connection* connection) {
   return false;
@@ -27,4 +27,16 @@ InterfaceRegistry* Service::GetInterfaceRegistryForConnection() {
   return nullptr;
 }
 
+Connector* Service::connector() {
+  return context_->connector();
+}
+
+ServiceContext* Service::context() {
+  return context_.get();
+}
+
+void Service::set_context(std::unique_ptr<ServiceContext> context) {
+  context_ = std::move(context);
+}
+
 }  // namespace shell