Fix the new First Run sentinel file path determination.

chrome/installer/util/eula_util.cc

 // Copyright (c) 2013 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/util/eula_util.h"
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace installer {
 
 namespace {
 
-bool IsChromeFirstRunPending(BrowserDistribution* dist) {
-  // Chrome creates the first run sentinel after the user has gone through the
-  // first-run flow. Assume Chrome has been run if the path to the sentinel
-  // cannot be determined.
-  base::FilePath first_run_sentinel;
-  return InstallUtil::GetSentinelFilePath(chrome::kFirstRunSentinel, dist,
-                                          &first_run_sentinel) &&
-      !base::PathExists(first_run_sentinel);
-}
-
 bool IsEULAAcceptanceFlagged(BrowserDistribution* dist) {
   // Chrome creates the EULA sentinel after the EULA has been accepted when
   // doing so is required by master_preferences. Assume the EULA has not been
   // accepted if the path to the sentinel cannot be determined.
   base::FilePath eula_sentinel;
   return InstallUtil::GetSentinelFilePath(kEULASentinelFile, dist,
                                           &eula_sentinel) &&
       base::PathExists(eula_sentinel);
 }
 
@@ skipping 40 matching lines @@
         << "Binaries are not installed, but Chrome is multi-install.";
   }
   BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BROWSER);
 
   // Is Google Update waiting for Chrome's EULA to be accepted?
   DWORD eula_accepted = 0;
   if (prod_state.GetEulaAccepted(&eula_accepted) && !eula_accepted)
     return QUERY_EULA_NOT_ACCEPTED;
 
-  if (!IsChromeFirstRunPending(dist) || IsEULAAcceptanceFlagged(dist))
+  if (InstallUtil::IsFirstRunSentinelPresent() || IsEULAAcceptanceFlagged(dist))
     return QUERY_EULA_ACCEPTED;
 
   // EULA acceptance not flagged. Now see if it is required.
   scoped_ptr<MasterPreferences> install_prefs(GetMasterPrefs(prod_state));
   // If we fail to get master preferences, assume that EULA is not required.
   if (!install_prefs)
     return QUERY_EULA_ACCEPTED;
 
   bool eula_required = false;
   // If kRequireEula value is absent, assume EULA is not required.
   if (!install_prefs->GetBool(master_preferences::kRequireEula, &eula_required))
     return QUERY_EULA_ACCEPTED;
 
   return eula_required ? QUERY_EULA_NOT_ACCEPTED : QUERY_EULA_ACCEPTED;
 }
 
 }  // namespace installer