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

chrome/browser/first_run/upgrade_util_win.cc

Index: chrome/browser/first_run/upgrade_util_win.cc
===================================================================
--- chrome/browser/first_run/upgrade_util_win.cc	(revision 237598)
+++ chrome/browser/first_run/upgrade_util_win.cc	(working copy)
@@ -252,13 +252,14 @@
     std::wstring rename_cmd;
     if (key.ReadValue(google_update::kRegRenameCmdField,
                       &rename_cmd) == ERROR_SUCCESS) {
-      base::win::ScopedHandle handle;
+      base::ProcessHandle handle;
       base::LaunchOptions options;
       options.wait = true;
       options.start_hidden = true;
       if (base::LaunchProcess(rename_cmd, options, &handle)) {
         DWORD exit_code;
         ::GetExitCodeProcess(handle, &exit_code);
+        ::CloseHandle(handle);
         if (exit_code == installer::RENAME_SUCCESSFUL)
           return true;
       }