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

mojo/shell/runner/host/child_process_host.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_RUNNER_HOST_CHILD_PROCESS_HOST_H_
 #define MOJO_SHELL_RUNNER_HOST_CHILD_PROCESS_HOST_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/public/cpp/system/message_pipe.h"
-#include "mojo/shell/identity.h"
+#include "mojo/shell/public/cpp/identity.h"
 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 #include "mojo/shell/runner/host/child_process_host.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace mojo {
+class Identity;
 namespace shell {
 
-class Identity;
 class NativeRunnerDelegate;
 
 // This class represents a "child process host". Handles launching and
 // connecting a platform-specific "pipe" to the child, and supports joining the
 // child process. Currently runs a single app (loaded from the file system).
 //
 // This class is not thread-safe. It should be created/used/destroyed on a
 // single thread.
 //
 // Note: Does not currently work on Windows before Vista.
@@ skipping 52 matching lines @@
 
   base::WeakPtrFactory<ChildProcessHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessHost);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_RUNNER_HOST_CHILD_PROCESS_HOST_H_