Make Service own ServiceContext.

services/shell/tests/connect/connect_test_class_app.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 "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
@@ skipping 13 matching lines @@
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public InterfaceFactory<test::mojom::ClassInterface>,
       public test::mojom::ConnectTestService,
       public test::mojom::ClassInterface {
  public:
   ConnectTestClassApp() {}
   ~ConnectTestClassApp() override {}
 
  private:
   // shell::Service:
-  void OnStart(Connector* connector, const Identity& identity,
-               uint32_t id) override {
-    connector_ = connector;
+  void OnStart(const Identity& identity) override {
     identity_ = identity;
   }
   bool OnConnect(Connection* connection) override {
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     connection->AddInterface<test::mojom::ClassInterface>(this);
     inbound_connections_.insert(connection);
     connection->SetConnectionLostClosure(
         base::Bind(&ConnectTestClassApp::OnConnectionError,
                    base::Unretained(this), connection));
     return true;
@@ skipping 25 matching lines @@
   }
 
   void OnConnectionError(Connection* connection) {
     auto it = inbound_connections_.find(connection);
     DCHECK(it != inbound_connections_.end());
     inbound_connections_.erase(it);
     if (inbound_connections_.empty())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
-  Connector* connector_ = nullptr;
   Identity identity_;
   std::set<Connection*> inbound_connections_;
   mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
   mojo::BindingSet<test::mojom::ClassInterface> class_interface_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectTestClassApp);
 };
 
 }  // namespace shell
 
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   MojoResult rv = shell::ServiceRunner(new shell::ConnectTestClassApp)
                       .Run(shell_handle);
   return rv;
 }