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

chrome/browser/first_run/upgrade_util_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/first_run/upgrade_util.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 234 matching lines @@
             !cmd_version.Equals(pv_version)) {
           return false;
         }
       }
     }
 
     // First try to rename exe by launching rename command ourselves.
     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;
       }
     }
   }
 
   // Rename didn't work so try to rename by calling Google Update
   return InvokeGoogleUpdateForRename();
 }
 
 bool DoUpgradeTasks(const CommandLine& command_line) {
   // The DelegateExecute verb handler finalizes pending in-use updates for
   // metro mode launches, as Chrome cannot be gracefully relaunched when
   // running in this mode.
   if (base::win::IsMetroProcess())
     return false;
   if (!SwapNewChromeExeIfPresent())
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
   }
   return true;
 }
 
 }  // namespace upgrade_util