Add a instance groups to Connect(), and introduce an Identity struct.

mojo/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 <utility>
 
 #include "base/bind.h"
@@ skipping 32 matching lines @@
         title_(title),
         request_(std::move(request)) {
     Start();
   }
   ~ProvidedShellClient() override {
     Join();
   }
 
  private:
   // mojo::ShellClient:
-  void Initialize(Connector* connector, const std::string& name,
-                  const std::string& user_id, uint32_t id) override {
-    name_ = name;
+  void Initialize(Connector* connector, const Identity& identity,
+                  uint32_t id) override {
+    name_ = identity.name();
+    userid_ = identity.user_id();
     id_ = id;
-    userid_ = user_id;
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
   bool AcceptConnection(Connection* connection) override {
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     connection->AddInterface<test::mojom::BlockedInterface>(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->GetRemoteApplicationName();
-    state->connection_remote_userid = connection->GetRemoteUserID();
+    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 = name_;
     state->initialize_id = id_;
     state->initialize_userid = userid_;
     connection->GetInterface(&caller_);
     caller_->ConnectionAccepted(std::move(state));
 
     return true;
   }
 
@@ skipping 48 matching lines @@
       public InterfaceFactory<mojom::ShellClientFactory>,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public mojom::ShellClientFactory,
       public test::mojom::ConnectTestService {
  public:
   ConnectTestShellClient() {}
   ~ConnectTestShellClient() override {}
 
  private:
   // mojo::ShellClient:
-  void Initialize(Connector* connector, const std::string& name,
-                  const std::string& user_id, uint32_t id) override {
+  void Initialize(Connector* connector, const Identity& identity,
+                  uint32_t id) override {
     bindings_.set_connection_error_handler(
         base::Bind(&ConnectTestShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
   bool AcceptConnection(Connection* connection) override {
     connection->AddInterface<ShellClientFactory>(this);
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     return true;
   }
   void ShellConnectionLost() override {
@@ skipping 43 matching lines @@
 
 }  // namespace shell
 }  // namespace mojo
 
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   MojoResult rv = mojo::ApplicationRunner(
       new mojo::shell::ConnectTestShellClient).Run(shell_handle);
   return rv;
 }