Index: content/browser/child_process_launcher.h |
diff --git a/content/browser/child_process_launcher.h b/content/browser/child_process_launcher.h |
index 6a17aa027db825eb4f990086f11dfefa2ee8b833..0ff1baa9eb04c0170d7d9f5e2eb97bad3dfb16bb 100644 |
--- a/content/browser/child_process_launcher.h |
+++ b/content/browser/child_process_launcher.h |
@@ -19,7 +19,7 @@ |
#include "content/common/content_export.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/common/result_codes.h" |
-#include "mojo/edk/embedder/embedder.h" |
+#include "mojo/edk/embedder/pending_process_connection.h" |
#include "mojo/edk/embedder/scoped_platform_handle.h" |
namespace base { |
@@ -80,7 +80,7 @@ class CONTENT_EXPORT ChildProcessLauncher : public base::NonThreadSafe { |
std::unique_ptr<base::CommandLine> cmd_line, |
int child_process_id, |
Client* client, |
- const std::string& mojo_child_token, |
+ std::unique_ptr<mojo::edk::PendingProcessConnection> pending_connection, |
const mojo::edk::ProcessErrorCallback& process_error_callback, |
bool terminate_on_shutdown = true); |
~ChildProcessLauncher(); |
@@ -146,14 +146,13 @@ class CONTENT_EXPORT ChildProcessLauncher : public base::NonThreadSafe { |
base::TerminationStatus termination_status_; |
int exit_code_; |
bool starting_; |
+ std::unique_ptr<mojo::edk::PendingProcessConnection> pending_connection_; |
const mojo::edk::ProcessErrorCallback process_error_callback_; |
// Controls whether the child process should be terminated on browser |
// shutdown. Default behavior is to terminate the child. |
const bool terminate_child_on_shutdown_; |
- const std::string mojo_child_token_; |
- |
scoped_refptr<internal::ChildProcessLauncherHelper> helper_; |
base::WeakPtrFactory<ChildProcessLauncher> weak_factory_; |