Fix the new First Run sentinel file path determination.

chrome/browser/first_run/first_run_internal_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_internal.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include "base/base_paths.h"
@@ skipping 127 matching lines @@
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
   } else if (!InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())) {
     content::BrowserThread::GetBlockingPool()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&InstallUtil::TriggerActiveSetupCommand),
         base::TimeDelta::FromSeconds(kTiggerActiveSetupDelaySeconds));
   }
 }
 
-bool GetFirstRunSentinelFilePath(base::FilePath* path) {
-  return InstallUtil::GetSentinelFilePath(
-      chrome::kFirstRunSentinel, BrowserDistribution::GetDistribution(), path);
-}
+bool IsFirstRunSentinelPresent() {
+  base::FilePath sentinel;
+  if (!GetFirstRunSentinelFilePath(&sentinel) || base::PathExists(sentinel))
+    return true;
 
-bool GetLegacyFirstRunSentinelFilePath(base::FilePath* path) {
-  // The first run sentinel for user-level installs on Windows used to
-  // be in the application directory.
+  // Copy any legacy first run sentinel file for Windows user-level installs
+  // from the application directory to the user data directory.
   base::FilePath exe_path;
-  if (!PathService::Get(base::DIR_EXE, &exe_path) ||
-      !InstallUtil::IsPerUserInstall(exe_path.value().c_str())) {
-    return false;
+  if (PathService::Get(base::DIR_EXE, &exe_path) &&
+      InstallUtil::IsPerUserInstall(exe_path.value().c_str())) {
+    base::FilePath legacy_sentinel = exe_path.Append(chrome::kFirstRunSentinel);
+    if (base::PathExists(legacy_sentinel)) {
+      // Copy the file instead of moving it to avoid breaking developer builds
+      // where the sentinel is dropped beside chrome.exe by a build action.
+      bool migrated = base::CopyFile(legacy_sentinel, sentinel);
+      DPCHECK(migrated);
+      return true;

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

please preserve this comment from first_run.cc:
// Sentinel is present regardless of whether or not it was migrated.
since it explains why true is returned even when !migrated

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

Done.

+    }
   }
-  *path = exe_path.Append(chrome::kFirstRunSentinel);
-  return true;
+
+  return false;
 }
 
 bool ShowPostInstallEULAIfNeeded(installer::MasterPreferences* install_prefs) {
   if (IsEULANotAccepted(install_prefs)) {
     // Show the post-installation EULA. This is done by setup.exe and the
     // result determines if we continue or not. We wait here until the user
     // dismisses the dialog.
 
     // The actual eula text is in a resource in chrome. We extract it to
     // a text file so setup.exe can use it as an inner frame.
@@ skipping 23 matching lines @@
 base::FilePath MasterPrefsPath() {
   // The standard location of the master prefs is next to the chrome binary.
   base::FilePath master_prefs;
   if (!PathService::Get(base::DIR_EXE, &master_prefs))
     return base::FilePath();
   return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
 }
 
 }  // namespace internal
 }  // namespace first_run