Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

components/nacl/browser/nacl_process_host.cc

 // Copyright (c) 2012 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 "components/nacl/browser/nacl_process_host.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 959 matching lines @@
     return false;
   }
   if (debug_exception_handler_requested_) {
     // The NaCl process should not request this multiple times.
     DLOG(ERROR) << "Multiple AttachDebugExceptionHandler requests received";
     return false;
   }
   debug_exception_handler_requested_ = true;
 
   base::ProcessId nacl_pid = base::GetProcId(process_->GetData().handle);
-  base::ProcessHandle temp_handle;
+  base::win::ScopedHandle process_handle;
   // We cannot use process_->GetData().handle because it does not have
   // the necessary access rights.  We open the new handle here rather
   // than in the NaCl broker process in case the NaCl loader process
   // dies before the NaCl broker process receives the message we send.
   // The debug exception handler uses DebugActiveProcess() to attach,
   // but this takes a PID.  We need to prevent the NaCl loader's PID
   // from being reused before DebugActiveProcess() is called, and
   // holding a process handle open achieves this.
   if (!base::OpenProcessHandleWithAccess(
            nacl_pid,
            base::kProcessAccessQueryInformation |
            base::kProcessAccessSuspendResume |
            base::kProcessAccessTerminate |
            base::kProcessAccessVMOperation |
            base::kProcessAccessVMRead |
            base::kProcessAccessVMWrite |
            base::kProcessAccessDuplicateHandle |
            base::kProcessAccessWaitForTermination,
-           &temp_handle)) {
+           process_handle.Receive())) {
     LOG(ERROR) << "Failed to get process handle";
     return false;
   }
-  base::win::ScopedHandle process_handle(temp_handle);
 
   attach_debug_exception_handler_reply_msg_.reset(reply_msg);
   // If the NaCl loader is 64-bit, the process running its debug
   // exception handler must be 64-bit too, so we use the 64-bit NaCl
   // broker process for this.  Otherwise, on a 32-bit system, we use
   // the 32-bit browser process to run the debug exception handler.
   if (RunningOnWOW64()) {
     return NaClBrokerService::GetInstance()->LaunchDebugExceptionHandler(
                weak_factory_.GetWeakPtr(), nacl_pid, process_handle, info);
   } else {
     NaClStartDebugExceptionHandlerThread(
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl