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

services/ui/test_wm/test_wm.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <utility>
 
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ skipping 11 matching lines @@
 
 class TestWM : public service_manager::Service,
                public ui::WindowTreeClientDelegate,
                public ui::WindowManagerDelegate {
  public:
   TestWM() {}
   ~TestWM() override {}
 
  private:
   // service_manager::Service:
-  void OnStart() override {
+  void OnStart(service_manager::ServiceContext* context) override {
     window_tree_client_.reset(new ui::WindowTreeClient(this, this));
-    window_tree_client_->ConnectAsWindowManager(context()->connector());
+    window_tree_client_->ConnectAsWindowManager(context->connector());
   }
 
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     return false;
   }
 
   // ui::WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override {
     // WindowTreeClients configured as the window manager should never get
@@ skipping 67 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWM);
 };
 
 }  // namespace test
 }  // namespace ui
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new ui::test::TestWM);
   return runner.Run(service_request_handle);
 }