diff options
| author | rvargas <rvargas@chromium.org> | 2014-09-24 18:02:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-25 01:02:46 +0000 |
| commit | 833c1fb479d491e5ac3f9ed83f93a088cb51e4bc (patch) | |
| tree | 1e508e32850187983356f3684687c4a30b6273e8 /remoting/host/win/unprivileged_process_delegate.cc | |
| parent | d87803b74c52fbee3dbaff15a87b75e965ac97c4 (diff) | |
| download | chromium_src-833c1fb479d491e5ac3f9ed83f93a088cb51e4bc.zip chromium_src-833c1fb479d491e5ac3f9ed83f93a088cb51e4bc.tar.gz chromium_src-833c1fb479d491e5ac3f9ed83f93a088cb51e4bc.tar.bz2 | |
Remove implicit HANDLE conversions from remoting.
BUG=416722
R=garykac@chromium.org
Review URL: https://codereview.chromium.org/602763003
Cr-Commit-Position: refs/heads/master@{#296602}
Diffstat (limited to 'remoting/host/win/unprivileged_process_delegate.cc')
| -rw-r--r-- | remoting/host/win/unprivileged_process_delegate.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/host/win/unprivileged_process_delegate.cc b/remoting/host/win/unprivileged_process_delegate.cc index 69a45aa..9b22a70 100644 --- a/remoting/host/win/unprivileged_process_delegate.cc +++ b/remoting/host/win/unprivileged_process_delegate.cc @@ -83,7 +83,7 @@ bool CreateRestrictedToken(ScopedHandle* token_out) { ScopedHandle token(temp_handle); sandbox::RestrictedToken restricted_token; - if (restricted_token.Init(token) != ERROR_SUCCESS) + if (restricted_token.Init(token.Get()) != ERROR_SUCCESS) return false; // Remove all privileges in the token. @@ -245,7 +245,7 @@ void UnprivilegedProcessDelegate::LaunchProcess( // Determine our logon SID, so we can grant it access to our window station // and desktop. - ScopedSid logon_sid = GetLogonSid(token); + ScopedSid logon_sid = GetLogonSid(token.Get()); if (!logon_sid) { PLOG(ERROR) << "Failed to retrieve the logon SID"; ReportFatalError(); @@ -306,7 +306,7 @@ void UnprivilegedProcessDelegate::LaunchProcess( ScopedHandle worker_thread; if (!LaunchProcessWithToken(command_line.GetProgram(), command_line.GetCommandLineString(), - token, + token.Get(), &process_attributes, &thread_attributes, true, @@ -346,7 +346,7 @@ void UnprivilegedProcessDelegate::KillProcess() { event_handler_ = NULL; if (worker_process_.IsValid()) { - TerminateProcess(worker_process_, CONTROL_C_EXIT); + TerminateProcess(worker_process_.Get(), CONTROL_C_EXIT); worker_process_.Close(); } } @@ -361,7 +361,7 @@ bool UnprivilegedProcessDelegate::OnMessageReceived( void UnprivilegedProcessDelegate::OnChannelConnected(int32 peer_pid) { DCHECK(CalledOnValidThread()); - DWORD pid = GetProcessId(worker_process_); + DWORD pid = GetProcessId(worker_process_.Get()); if (pid != static_cast<DWORD>(peer_pid)) { LOG(ERROR) << "The actual client PID " << pid << " does not match the one reported by the client: " @@ -402,7 +402,7 @@ void UnprivilegedProcessDelegate::ReportProcessLaunched( SYNCHRONIZE | PROCESS_DUP_HANDLE | PROCESS_QUERY_INFORMATION; HANDLE temp_handle; if (!DuplicateHandle(GetCurrentProcess(), - worker_process_, + worker_process_.Get(), GetCurrentProcess(), &temp_handle, desired_access, |