[Fixit-Dec-2012] Auto-launch system-level Chrome post user-level Chrome self-destruction.

chrome/installer/util/install_util.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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
@@ skipping 359 matching lines @@
          FilePath::CompareEqualIgnoreCase(exe_dir.DirName().BaseName().value(),
                                           chrome_sxs_dir);
 }
 
 bool InstallUtil::IsChromeSxSProcess() {
   static bool sxs = CheckIsChromeSxSProcess();
   return sxs;
 }
 
 bool InstallUtil::GetSentinelFilePath(const FilePath::CharType* file,
+                                      bool system_install,
                                       BrowserDistribution* dist,
                                       FilePath* path) {
-  FilePath exe_path;
-  if (!PathService::Get(base::DIR_EXE, &exe_path))
-    return false;
-
-  if (IsPerUserInstall(exe_path.value().c_str())) {
-    *path = exe_path;
+  if (!system_install) {
+    *path = installer::GetChromeInstallPath(false, dist);

[grt (UTC plus 2), 2013/01/02 17:59:33]

This has a different subtle flaw than the old one (nice catch there, btw!). The
old technique, when called by Chrome, would return the correct path even for the
case of chrome.exe executing outside of the normal per-user install directory
(in a build tree or on a bot, for example).

[gab, 2013/01/02 21:15:48]

Ah! Good catch :)! Fixed both now I think!

   } else {
     std::vector<FilePath> user_data_dir_paths;
     installer::GetChromeUserDataPaths(dist, &user_data_dir_paths);
 
     if (!user_data_dir_paths.empty())
       *path = user_data_dir_paths[0];
     else
       return false;
   }
 
@@ skipping 183 matching lines @@
   // Open the program and see if it references the expected file.
   base::win::ScopedHandle handle;
   BY_HANDLE_FILE_INFORMATION info = {};
 
   return (OpenForInfo(program, &handle) &&
           GetInfo(handle, &info) &&
           info.dwVolumeSerialNumber == file_info_.dwVolumeSerialNumber &&
           info.nFileIndexHigh == file_info_.nFileIndexHigh &&
           info.nFileIndexLow == file_info_.nFileIndexLow);
 }