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 659 matching lines @@
 // 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);
+  if (!PathService::Get(chrome::DIR_USER_DATA, &first_run_sentinel))

[grt (UTC plus 2), 2014/03/25 17:37:06]

i think you mean:
  if (PathService::Get(...))
    first_run_sentinel = first_run_sentinel.Append(chrome::kFirstRunSentinel);
but it's not clear to me what the right thing is for the else case. NOTREACHED
and early return?

on second thought, util/eula_util.cc has a "IsChromeFirstRunPending" method that
seems to answer exactly the question that's being asked in the code here. how
about making that function public and using it here (and anywhere else that does
something similar)?

[msw, 2014/03/25 23:33:13]

Good catch and recommendation. I've reorganized and consolidated the first run
sentinel code around InstallUtil. I double-checked the logic and tested
developer Chromium builds (with and without the sentinel at default and
overridden user-data-dirs), as well as Chrome branded mini_installer instances
installed with setup.exe --chrome and --chrome-sxs (also with default and
overridden user-data-dirs). I also ensured that making Chrome the default
browser on first run also removed the sentinel to show the first-run experience
on the re-launch, and ensured that both --force-first-run and --no-first-run
worked as expected. As far as I can tell, the first run sentinel is being
created at (or copied to) the correct locations and respected by the application
correctly.

I did not verify that environment variable or policy overrides of DIR_USER_DATA
worked as expected, but they're handled in the same function as the commandline
overrides that I tested, so they should work fine. I did not test scenarios with
mixed system-level and user-level installations, nor deprecated
kMetroChromeUserDataSubDir scenarios, and may have missed some other corner
cases, but on the whole I think this is much better than it was.

+    first_run_sentinel = first_run_sentinel.Append(chrome::kFirstRunSentinel);
+
   // 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) ?
            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