Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: win8/viewer/metro_viewer_process_host.cc

Issue 860453002: Move OpenProcessHandleWithAccess to Process::OpenWithAccess. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add ServiceProcessControlBrowserTest.Setup again Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: win8/viewer/metro_viewer_process_host.cc
diff --git a/win8/viewer/metro_viewer_process_host.cc b/win8/viewer/metro_viewer_process_host.cc
index 2e04ef80a4ffbc327b9bbc0a348f7a0e79d6afc6..61a776c1206d7026add3b5db40e941a926da324b 100644
--- a/win8/viewer/metro_viewer_process_host.cc
+++ b/win8/viewer/metro_viewer_process_host.cc
@@ -12,7 +12,6 @@
#include "base/memory/ref_counted.h"
#include "base/path_service.h"
#include "base/process/process.h"
-#include "base/process/process_handle.h"
#include "base/strings/string16.h"
#include "base/synchronization/waitable_event.h"
#include "base/time/time.h"
@@ -68,14 +67,13 @@ MetroViewerProcessHost::~MetroViewerProcessHost() {
if (message_filter_.get()) {
// Wait for the viewer process to go away.
if (viewer_process_id != base::kNullProcessId) {
- base::ProcessHandle viewer_process = NULL;
- base::OpenProcessHandleWithAccess(
- viewer_process_id,
- PROCESS_QUERY_INFORMATION | SYNCHRONIZE,
- &viewer_process);
- if (viewer_process) {
- ::WaitForSingleObject(viewer_process, INFINITE);
- ::CloseHandle(viewer_process);
+ base::Process viewer_process =
+ base::Process::OpenWithAccess(
+ viewer_process_id,
+ PROCESS_QUERY_INFORMATION | SYNCHRONIZE);
+ if (viewer_process.IsValid()) {
+ int exit_code;
+ viewer_process.WaitForExit(&exit_code);
}
}
channel_->RemoveFilter(message_filter_.get());

Powered by Google App Engine
This is Rietveld 408576698