Fix the new First Run sentinel file path determination.

chrome/installer/setup/install.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/installer/setup/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 
@@ skipping 658 matching lines @@
 // in install_worker.cc needs to be increased for Active Setup to invoke this
 // again for all users of this install.
 void HandleActiveSetupForBrowser(const base::FilePath& installation_root,
                                  const Product& chrome,
                                  bool force) {
   DCHECK(chrome.is_chrome());
   // Only create shortcuts on Active Setup if the first run sentinel is not
   // present for this user (as some shortcuts used to be installed on first
   // run and this could otherwise re-install shortcuts for users that have
   // already deleted them in the past).
-  base::FilePath first_run_sentinel;
-  InstallUtil::GetSentinelFilePath(
-      chrome::kFirstRunSentinel, chrome.distribution(), &first_run_sentinel);
   // Decide whether to create the shortcuts or simply replace existing
   // shortcuts; if the decision is to create them, only shortcuts whose matching
   // all-users shortcut isn't present on the system will be created.
   InstallShortcutOperation install_operation =
-      (!force && base::PathExists(first_run_sentinel) ?
+      (!force && InstallUtil::IsFirstRunSentinelPresent() ?
            INSTALL_SHORTCUT_REPLACE_EXISTING :
            INSTALL_SHORTCUT_CREATE_EACH_IF_NO_SYSTEM_LEVEL);
 
   // Read master_preferences copied beside chrome.exe at install.
   MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
   base::FilePath chrome_exe(installation_root.Append(kChromeExe));
   CreateOrUpdateShortcuts(
       chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
 }
 
 bool InstallFromWebstore(const std::string& app_code) {
   base::FilePath app_host_path(chrome_launcher_support::GetAnyAppHostPath());
   if (app_host_path.empty())
     return false;
 
   CommandLine cmd(app_host_path);
   cmd.AppendSwitchASCII(::switches::kInstallFromWebstore, app_code);
   VLOG(1) << "App install command: " << cmd.GetCommandLineString();
   return base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }
 
 }  // namespace installer