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

chrome/browser/extensions/api/messaging/native_process_launcher_win.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 "chrome/browser/extensions/api/messaging/native_process_launcher.h"
 
 #include <windows.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 118 matching lines @@
 
   string16 command_line_string = command_line.GetCommandLineString();
 
   string16 command = base::StringPrintf(
       L"%ls /c %ls < %ls > %ls",
       comspec.get(), command_line_string.c_str(),
       in_pipe_name.c_str(), out_pipe_name.c_str());
 
   base::LaunchOptions options;
   options.start_hidden = true;
-  base::win::ScopedHandle cmd_handle;
+  base::ProcessHandle cmd_handle;
   if (!base::LaunchProcess(command.c_str(), options, &cmd_handle)) {
     LOG(ERROR) << "Error launching process "
                << command_line.GetProgram().MaybeAsASCII();
     return false;
   }
 
   bool stdout_connected = ConnectNamedPipe(stdout_pipe.Get(), NULL) ?
       TRUE : GetLastError() == ERROR_PIPE_CONNECTED;
   bool stdin_connected = ConnectNamedPipe(stdin_pipe.Get(), NULL) ?
       TRUE : GetLastError() == ERROR_PIPE_CONNECTED;
   if (!stdout_connected || !stdin_connected) {
-    base::KillProcess(cmd_handle.Get(), 0, false);
+    base::KillProcess(cmd_handle, 0, false);
+    base::CloseProcessHandle(cmd_handle);
     LOG(ERROR) << "Failed to connect IO pipes when starting "
                << command_line.GetProgram().MaybeAsASCII();
     return false;
   }
 
-  *process_handle = cmd_handle.Take();
+  *process_handle = cmd_handle;
   *read_file = stdout_pipe.Take();
   *write_file = stdin_pipe.Take();
 
   return true;
 }
 
 }  // namespace extensions