Revert of Service Manager: Remove ServiceContext* arg from Service::OnStart()

mash/session/session.cc

Index: mash/session/session.cc
diff --git a/mash/session/session.cc b/mash/session/session.cc
index f10b3535fce5160c6598813b139f74fbcea26b1a..a4640efb4fe93f2dae61a6e84139da4cfcfd08f8 100644
--- a/mash/session/session.cc
+++ b/mash/session/session.cc
@@ -29,12 +29,14 @@
 Session::Session() : screen_locked_(false) {}
 Session::~Session() {}
 
-void Session::OnStart() {
+void Session::OnStart(service_manager::ServiceContext* context) {
+  context_ = context;
+
   StartWindowManager();
   StartQuickLaunch();
 
   // Launch a chrome window for dev convience; don't do this in the long term.
-  context()->connector()->Connect("service:content_browser");
+  context->connector()->Connect("service:content_browser");
 }
 
 bool Session::OnConnect(const service_manager::ServiceInfo& remote_info,
@@ -47,7 +49,7 @@
   // TODO(beng): Notify connected listeners that login is happening, potentially
   // give them the option to stop it.
   mash::login::mojom::LoginPtr login;
-  context()->connector()->ConnectToInterface("service:login", &login);
+  context_->connector()->ConnectToInterface("service:login", &login);
   login->ShowLoginUI();
   // This kills the user environment.
   base::MessageLoop::current()->QuitWhenIdle();
@@ -55,7 +57,7 @@
 
 void Session::SwitchUser() {
   mash::login::mojom::LoginPtr login;
-  context()->connector()->ConnectToInterface("service:login", &login);
+  context_->connector()->ConnectToInterface("service:login", &login);
   login->SwitchUser();
 }
 
@@ -124,7 +126,7 @@
   // TODO(beng): This would be the place to insert logic that counted restarts
   //             to avoid infinite crash-restart loops.
   std::unique_ptr<service_manager::Connection> connection =
-      context()->connector()->Connect(url);
+      context_->connector()->Connect(url);
   // Note: |connection| may be null if we've lost our connection to the service
   // manager.
   if (connection) {