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

mojo/shell/public/cpp/connection.h

 // Copyright 2014 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.
 
 #ifndef MOJO_SHELL_PUBLIC_CPP_CONNECTION_H_
 #define MOJO_SHELL_PUBLIC_CPP_CONNECTION_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
 #include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/identity.h"
 #include "mojo/shell/public/cpp/interface_registry.h"
 #include "mojo/shell/public/interfaces/connector.mojom.h"
 #include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 
 namespace mojo {
 
 class InterfaceBinder;
 
 // Represents a connection to another application. An instance of this class is
 // returned from Shell's ConnectToApplication(), and passed to ShellClient's
@@ skipping 56 matching lines @@
     mojo::GetInterface(GetRemoteInterfaces(), ptr);
   }
 
   // Returns the name that was used by the source application to establish a
   // connection to the destination application.
   //
   // When Connection is representing and outgoing connection, this will be the
   // same as the value returned by GetRemoveApplicationName().
   virtual const std::string& GetConnectionName() = 0;
 
-  // Returns the name identifying the remote application on this connection.
-  virtual const std::string& GetRemoteApplicationName() = 0;
-
-  // Returns the User ID for the remote application. Prior to the Connect()
-  // callback being fired, this will return the value passed via Connect().
-  // After the Connect() callback (call AddRemoteIDCallback to register one)
-  // this will return the actual user id the shell ran the target as.
-  virtual const std::string& GetRemoteUserID() const = 0;
+  // Returns the remote identity. While the connection is in the pending state,
+  // the user_id() field will be the value passed via Connect(). After the
+  // connection is completed, it will change to the value assigned by the shell.
+  // Call AddConnectionCompletedClosure() to schedule a closure to be run when
+  // the resolved user id is available.
+  virtual const Identity& GetRemoteIdentity() const = 0;
 
   // Register a handler to receive an error notification on the pipe to the
   // remote application's InterfaceProvider.
   virtual void SetConnectionLostClosure(const Closure& handler) = 0;
 
   // Returns the result of the connection. This function should only be called
   // when the connection state is not pending. Call
   // AddConnectionCompletedClosure() to schedule a closure to be run when the
   // connection is processed by the shell.
   virtual shell::mojom::ConnectResult GetResult() const = 0;
@@ skipping 25 matching lines @@
 
  protected:
   virtual InterfaceRegistry* GetLocalRegistry() = 0;
 
   virtual base::WeakPtr<Connection> GetWeakPtr() = 0;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_CONNECTION_H_