Return first_run_win to using the Chrome path provider to look up the user data dir.

chrome/browser/first_run/first_run_win.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/browser/first_run/first_run.h"
 
 #include <shellapi.h>
 #include <shlobj.h>
 #include <windows.h>
 
@@ skipping 135 matching lines @@
     if (!base::LaunchProcess(setup_path, launch_options, &ph) ||
         !::GetExitCodeProcess(ph, &exit_code)) {
       return false;
     }
 
     *ret_code = exit_code;
     return true;
   }
 }
 
+// Populates |path| with the path to |file| in the sentinel directory. This is
+// the application directory for user-level installs, and the default user data
+// dir for system-level installs. Returns false on error.
+bool GetSentinelFilePath(const wchar_t* file, FilePath* path) {
+  FilePath exe_path;
+  if (!PathService::Get(base::DIR_EXE, &exe_path))
+    return false;
+  if (InstallUtil::IsPerUserInstall(exe_path.value().c_str()))
+    *path = exe_path;
+  else if (!PathService::Get(chrome::DIR_USER_DATA, path))
+    return false;
+  *path = path->Append(file);
+  return true;
+}
+
 bool GetEULASentinelFilePath(FilePath* path) {
-  return InstallUtil::GetSentinelFilePath(
-      installer::kEULASentinelFile,
-      BrowserDistribution::GetDistribution(),
-      path);
+  return GetSentinelFilePath(installer::kEULASentinelFile, path);
 }
 
 // Returns true if the EULA is required but has not been accepted by this user.
 // The EULA is considered having been accepted if the user has gotten past
 // first run in the "other" environment (desktop or metro).
 bool IsEULANotAccepted(installer::MasterPreferences* install_prefs) {
   bool value = false;
   if (install_prefs->GetBool(installer::master_preferences::kRequireEula,
           &value) && value) {
     FilePath eula_sentinel;
@@ skipping 293 matching lines @@
                     int items_to_import) {
   return ImportSettingsWin(
       profile,
       importer_list->GetSourceProfileAt(0).importer_type,
       items_to_import,
       FilePath(),
       false);
 }
 
 bool GetFirstRunSentinelFilePath(FilePath* path) {
-  return InstallUtil::GetSentinelFilePath(
-      chrome::kFirstRunSentinel,
-      BrowserDistribution::GetDistribution(),
-      path);
+  return GetSentinelFilePath(chrome::kFirstRunSentinel, path);
 }
 
 void SetImportPreferencesAndLaunchImport(
     MasterPrefs* out_prefs,
     installer::MasterPreferences* install_prefs) {
   std::string import_bookmarks_path;
   install_prefs->GetString(
       installer::master_preferences::kDistroImportBookmarksFromFilePref,
       &import_bookmarks_path);
 
@@ skipping 116 matching lines @@
     return SKIP_FIRST_RUN;
 
   internal::SetShowWelcomePagePrefIfNeeded(install_prefs.get());
   internal::SetImportPreferencesAndLaunchImport(out_prefs, install_prefs.get());
   internal::SetDefaultBrowser(install_prefs.get());
 
   return SKIP_FIRST_RUN;
 }
 
 }  // namespace first_run