Move OpenProcessHandleWithAccess to Process::OpenWithAccess.

win8/viewer/metro_viewer_process_host.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "win8/viewer/metro_viewer_process_host.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #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"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 #include "ui/metro_viewer/metro_viewer_messages.h"
@@ skipping 35 matching lines @@
   if (!channel_) {
     instance_ = NULL;
     return;
   }
 
   base::ProcessId viewer_process_id = GetViewerProcessId();
   channel_->Close();
   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());
   }
   instance_ = NULL;
 }
 
 base::ProcessId MetroViewerProcessHost::GetViewerProcessId() {
   if (channel_)
     return channel_->GetPeerPID();
@@ skipping 246 matching lines @@
     const base::FilePath& folder) {
   if (success)
     select_folder_completion_callback_.Run(base::FilePath(folder), 0, NULL);
   else
     failure_callback_.Run(NULL);
   select_folder_completion_callback_.Reset();
   failure_callback_.Reset();
 }
 
 }  // namespace win8