Make Service own ServiceContext.

services/shell/tests/connect/connect_unittest.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 74 matching lines @@
   }
 
   void set_ping_callback(const base::Closure& callback) {
     ping_callback_ = callback;
   }
 
   void CompareConnectionState(
       const std::string& connection_local_name,
       const std::string& connection_remote_name,
       const std::string& connection_remote_userid,
-      uint32_t connection_remote_id,
       const std::string& initialize_local_name,
-      const std::string& initialize_userid,
-      uint32_t initialize_id) {
+      const std::string& initialize_userid) {
     EXPECT_EQ(connection_local_name, connection_state_->connection_local_name);
     EXPECT_EQ(connection_remote_name,
               connection_state_->connection_remote_name);
     EXPECT_EQ(connection_remote_userid,
               connection_state_->connection_remote_userid);
-    EXPECT_EQ(connection_remote_id, connection_state_->connection_remote_id);
     EXPECT_EQ(initialize_local_name, connection_state_->initialize_local_name);
-    EXPECT_EQ(initialize_id, connection_state_->initialize_id);
     EXPECT_EQ(initialize_userid, connection_state_->initialize_userid);
   }
 
  private:
   // test::ServiceTest:
   void SetUp() override {
     test::ServiceTest::SetUp();
     // We need to connect to the package first to force the shell to read the
     // package app's manifest and register aliases for the applications it
     // provides.
@@ skipping 289 matching lines @@
 
 // Tests that we can expose an interface to targets on outbound connections.
 TEST_F(ConnectTest, LocalInterface) {
   // Connect to a standalone application.
   {
     test::mojom::ConnectTestServicePtr service;
     std::unique_ptr<Connection> connection = connector()->Connect(kTestAppName);
     connection->GetInterface(&service);
     connection->AddInterface<test::mojom::ExposedInterface>(this);
 
-    uint32_t remote_id = mojom::kInvalidInstanceID;
     {
       base::RunLoop run_loop;
       EXPECT_TRUE(connection->IsPending());
       EXPECT_EQ(mojom::kInvalidInstanceID, connection->GetRemoteInstanceID());
       connection->AddConnectionCompletedClosure(
           base::Bind(&QuitLoop, &run_loop));
       run_loop.Run();
       EXPECT_FALSE(connection->IsPending());
-      remote_id = connection->GetRemoteInstanceID();
-      EXPECT_NE(mojom::kInvalidInstanceID, remote_id);
     }
 
     {
       base::RunLoop run_loop;
       set_ping_callback(base::Bind(&QuitLoop, &run_loop));
       run_loop.Run();
       CompareConnectionState(
-          kTestAppName, test_name(), test_userid(), test_instance_id(),
-          kTestAppName, connection->GetRemoteIdentity().user_id(), remote_id);
+          kTestAppName, test_name(), test_userid(), kTestAppName,
+          connection->GetRemoteIdentity().user_id());
     }
   }
 
   // Connect to an application provided by a package.
   {
     test::mojom::ConnectTestServicePtr service_a;
     std::unique_ptr<Connection> connection =
         connector()->Connect(kTestAppAName);
     connection->GetInterface(&service_a);
     connection->AddInterface<test::mojom::ExposedInterface>(this);
 
-    uint32_t remote_id = mojom::kInvalidInstanceID;
     {
       base::RunLoop run_loop;
       EXPECT_TRUE(connection->IsPending());
       EXPECT_EQ(mojom::kInvalidInstanceID, connection->GetRemoteInstanceID());
       connection->AddConnectionCompletedClosure(
           base::Bind(&QuitLoop, &run_loop));
       run_loop.Run();
       EXPECT_FALSE(connection->IsPending());
-      remote_id = connection->GetRemoteInstanceID();
-      EXPECT_NE(mojom::kInvalidInstanceID, remote_id);
     }
 
     {
       base::RunLoop run_loop;
       set_ping_callback(base::Bind(&QuitLoop, &run_loop));
       run_loop.Run();
       CompareConnectionState(
-          kTestAppAName, test_name(), test_userid(), test_instance_id(),
-          kTestAppAName, connection->GetRemoteIdentity().user_id(), remote_id);
+          kTestAppAName, test_name(), test_userid(), kTestAppAName,
+          connection->GetRemoteIdentity().user_id());
     }
 
   }
 }
 
 }  // namespace shell