Mojo EDK: Add safe process connection API

content/common/service_manager/child_connection.h

Index: content/common/service_manager/child_connection.h
diff --git a/content/common/service_manager/child_connection.h b/content/common/service_manager/child_connection.h
index 1e34ac09436a4616d646a7fe1a2e262fc67f60e7..01ece56b70bb8e6881cd2eb8f2a7c7451c9cb6e2 100644
--- a/content/common/service_manager/child_connection.h
+++ b/content/common/service_manager/child_connection.h
@@ -14,6 +14,7 @@
 #include "base/process/process_handle.h"
 #include "base/sequenced_task_runner.h"
 #include "content/common/content_export.h"
+#include "mojo/edk/embedder/pending_process_connection.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
@@ -35,7 +36,7 @@ class CONTENT_EXPORT ChildConnection {
   // connector to use to establish the connection.
   ChildConnection(const std::string& name,
                   const std::string& instance_id,
-                  const std::string& child_token,
+                  mojo::edk::PendingProcessConnection* process_connection,
                   service_manager::Connector* connector,
                   scoped_refptr<base::SequencedTaskRunner> io_task_runner);
   ~ChildConnection();
@@ -61,10 +62,9 @@ class CONTENT_EXPORT ChildConnection {
  private:
   class IOThreadContext;
 
-  const std::string child_token_;
   scoped_refptr<IOThreadContext> context_;
   service_manager::Identity child_identity_;
-  const std::string service_token_;
+  std::string service_token_;
   base::ProcessHandle process_handle_ = base::kNullProcessHandle;
 
   service_manager::InterfaceProvider remote_interfaces_;