Fix the new First Run sentinel file path determination.

chrome/installer/util/install_util.cc

Index: chrome/installer/util/install_util.cc
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index 570386e84fb12dfa0506ad4bf3ee395217494aed..6deee329efccf3fc87bb78b7d5c369f87db8c01c 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -28,6 +28,8 @@
 #include "base/win/metro.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
+#include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
@@ -399,10 +401,18 @@ bool InstallUtil::IsChromeSxSProcess() {
   return sxs;
 }
 
-bool InstallUtil::GetSentinelFilePath(
-    const base::FilePath::CharType* file,
-    BrowserDistribution* dist,
-    base::FilePath* path) {
+// static
+bool InstallUtil::IsFirstRunSentinelPresent() {
+  base::FilePath user_data_dir;

[grt (UTC plus 2), 2014/03/27 15:35:20]

please add something like:
  // This duplicates portions of code in first_run, but is required
  // here for use by the installer.

[msw, 2014/03/28 00:04:11]

Done (added a simple TODO).

+  return !PathService::Get(chrome::DIR_USER_DATA, &user_data_dir) ||
+         base::PathExists(user_data_dir.Append(chrome::kFirstRunSentinel));
+}
+
+// static
+bool InstallUtil::GetSentinelFilePath(const base::FilePath::CharType* file,

[grt (UTC plus 2), 2014/03/27 15:35:20]

this function is now only used to get the path for the EULA sentinel. in a
follow-on CL, please at least remove GetEULASentinelFilePath in
first_run_internal_win.cc and change this to be EULA-specific. maybe something
more grand makes sense, too. in a quick look at how it's used, i don't think it
needs to take a BrowserDistribution any longer.

[msw, 2014/03/28 00:04:11]

Yup, I'll follow up this CL with similar changes for the EULA sentinel.
It should use the proper user data dir, and there's room for cleanup.

+                                      BrowserDistribution* dist,
+                                      base::FilePath* path) {
+  // TODO(msw): Use PathService to obtain the correct DIR_USER_DATA.
   std::vector<base::FilePath> user_data_dir_paths;
   installer::GetChromeUserDataPaths(dist, &user_data_dir_paths);