diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/content/browser/child_process_launcher_helper_win.cc | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
| download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/child_process_launcher_helper_win.cc')
| -rw-r--r-- | chromium/content/browser/child_process_launcher_helper_win.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/chromium/content/browser/child_process_launcher_helper_win.cc b/chromium/content/browser/child_process_launcher_helper_win.cc index ca73f6006dc..46c2dbea83d 100644 --- a/chromium/content/browser/child_process_launcher_helper_win.cc +++ b/chromium/content/browser/child_process_launcher_helper_win.cc @@ -18,6 +18,7 @@ #include "mojo/edk/embedder/platform_channel_pair.h" #include "mojo/edk/embedder/scoped_platform_handle.h" #include "sandbox/win/src/sandbox_types.h" +#include "services/service_manager/embedder/result_codes.h" #include "services/service_manager/sandbox/win/sandbox_win.h" namespace content { @@ -27,12 +28,12 @@ void ChildProcessLauncherHelper::BeforeLaunchOnClientThread() { DCHECK_CURRENTLY_ON(client_thread_id_); } -mojo::edk::ScopedPlatformHandle +mojo::edk::ScopedInternalPlatformHandle ChildProcessLauncherHelper::PrepareMojoPipeHandlesOnClientThread() { DCHECK_CURRENTLY_ON(client_thread_id_); if (!delegate_->ShouldLaunchElevated()) - return mojo::edk::ScopedPlatformHandle(); + return mojo::edk::ScopedInternalPlatformHandle(); mojo::edk::NamedPlatformChannelPair named_pair; named_pair.PrepareToPassClientHandleToChildProcess(command_line()); @@ -89,11 +90,13 @@ void ChildProcessLauncherHelper::AfterLaunchOnLauncherThread( DCHECK(CurrentlyOnProcessLauncherTaskRunner()); } -base::TerminationStatus ChildProcessLauncherHelper::GetTerminationStatus( +ChildProcessTerminationInfo ChildProcessLauncherHelper::GetTerminationInfo( const ChildProcessLauncherHelper::Process& process, - bool known_dead, - int* exit_code) { - return base::GetTerminationStatus(process.process.Handle(), exit_code); + bool known_dead) { + ChildProcessTerminationInfo info; + info.status = + base::GetTerminationStatus(process.process.Handle(), &info.exit_code); + return info; } // static @@ -107,7 +110,7 @@ void ChildProcessLauncherHelper::ForceNormalProcessTerminationSync( DCHECK(CurrentlyOnProcessLauncherTaskRunner()); // Client has gone away, so just kill the process. Using exit code 0 means // that UMA won't treat this as a crash. - process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); + process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false); } void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( |