[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 366 matching lines @@
 }
 
 bool InstallUtil::GetSentinelFilePath(const FilePath::CharType* file,
                                       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;
+    // On user installs, the sentinel file path is by chrome.exe. DIR_EXE
+    // however is the directory of the current exe which could be another
+    // executable in the install hierarchy (e.g., setup.exe).
+    FilePath user_level_install_path(

[grt (UTC plus 2), 2013/01/03 15:41:27]

instead of requiring that the default install path be used, i think it's more
robust to look for chrome.exe in the current directory (true when called from
chrome or from setup.exe in a developer dir) and then two directories up (true
when called from setup.exe in any install dir).  so, something along the lines
of:
if (file_util::PathExists(exe_path.Append(installer::kChromeExe))) {
  *path = exe_path;
  return true;
}
FilePath product_dir(exe_path.DirName().DirName());
if (file_util::PathExists(product_dir.Append(installer::kChromeExe))) {
  *path = product_dir;
  return true;
}

[gab, 2013/01/03 17:11:14]

Fine, I was trying to avoid the assumption about being in the Installer
directory two levels above the product dir, but you convinced me otherwise :).

This can't return here though as there is further work to be done on |path| at
the bottom of this method. Because of this fact I think the most elegant way is
to use this if,elseif,else block; although this has the ugly aspect of always
initializing product_dir...

+        installer::GetChromeInstallPath(false, dist));
+    if (user_level_install_path.IsParent(exe_path))
+      *path = user_level_install_path;
+    else
+      *path = exe_path;
   } 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);
 }