Make Service own ServiceContext.

services/shell/tests/connect/connect_test_package.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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 43 matching lines @@
         title_(title),
         request_(std::move(request)) {
     Start();
   }
   ~ProvidedService() override {
     Join();
   }
 
  private:
   // shell::Service:
-  void OnStart(Connector* connector, const Identity& identity,
-               uint32_t id) override {
-    connector_ = connector;
+  void OnStart(const Identity& identity) override {
     identity_ = identity;
-    id_ = id;
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedService::OnConnectionError,
                    base::Unretained(this)));
   }
   bool OnConnect(Connection* connection) override {
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     connection->AddInterface<test::mojom::BlockedInterface>(this);
     connection->AddInterface<test::mojom::UserIdTest>(this);
 
     uint32_t remote_id = connection->GetRemoteInstanceID();
     test::mojom::ConnectionStatePtr state(test::mojom::ConnectionState::New());
     state->connection_local_name = connection->GetConnectionName();
     state->connection_remote_name = connection->GetRemoteIdentity().name();
     state->connection_remote_userid = connection->GetRemoteIdentity().user_id();
     state->connection_remote_id = remote_id;
     state->initialize_local_name = identity_.name();
-    state->initialize_id = id_;
     state->initialize_userid = identity_.user_id();
     connection->GetInterface(&caller_);
     caller_->ConnectionAccepted(std::move(state));
 
     return true;
   }
 
   // InterfaceFactory<test::mojom::ConnectTestService>:
   void Create(const Identity& remote_identity,
               test::mojom::ConnectTestServiceRequest request) override {
@@ skipping 23 matching lines @@
   // test::mojom::BlockedInterface:
   void GetTitleBlocked(const GetTitleBlockedCallback& callback) override {
     callback.Run("Called Blocked Interface!");
   }
 
   // test::mojom::UserIdTest:
   void ConnectToClassAppAsDifferentUser(
       mojom::IdentityPtr target,
       const ConnectToClassAppAsDifferentUserCallback& callback) override {
     Connector::ConnectParams params(target.To<Identity>());
-    std::unique_ptr<Connection> connection = connector_->Connect(&params);
+    std::unique_ptr<Connection> connection =
+        connector()->Connect(&params);
     {
       base::RunLoop loop;
       connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop));
       base::MessageLoop::ScopedNestableTaskAllower allow(
           base::MessageLoop::current());
       loop.Run();
     }
     callback.Run(static_cast<int32_t>(connection->GetResult()),
                  mojom::Identity::From(connection->GetRemoteIdentity()));
   }
 
   // base::SimpleThread:
   void Run() override {
     ServiceRunner(this).Run(request_.PassMessagePipe().release().value(),
                             false);
     delete this;
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
-  Connector* connector_ = nullptr;
   Identity identity_;
-  uint32_t id_ = shell::mojom::kInvalidInstanceID;
   const std::string title_;
   mojom::ServiceRequest request_;
   test::mojom::ExposedInterfacePtr caller_;
   mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
   mojo::BindingSet<test::mojom::BlockedInterface> blocked_bindings_;
   mojo::BindingSet<test::mojom::UserIdTest> user_id_test_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ProvidedService);
 };
 
 class ConnectTestService
     : public Service,
       public InterfaceFactory<mojom::ServiceFactory>,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public mojom::ServiceFactory,
       public test::mojom::ConnectTestService {
  public:
   ConnectTestService() {}
   ~ConnectTestService() override {}
 
  private:
   // shell::Service:
-  void OnStart(Connector* connector, const Identity& identity,
-               uint32_t id) override {
+  void OnStart(const Identity& identity) override {
     identity_ = identity;
     bindings_.set_connection_error_handler(
         base::Bind(&ConnectTestService::OnConnectionError,
                    base::Unretained(this)));
   }
   bool OnConnect(Connection* connection) override {
     connection->AddInterface<ServiceFactory>(this);
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     return true;
   }
@@ skipping 40 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ConnectTestService);
 };
 
 }  // namespace shell
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   MojoResult rv = shell::ServiceRunner(new shell::ConnectTestService)
                       .Run(shell_handle);
   return rv;
 }