This CL fixes bugs with EULA

- The first run import will trigger the eula again : this requires changes in browser_main.cc
  so the master prefs are not processed again by the importer process
- The launch of setup.exe to show the eula was using a path that only works on developer builds
  this requires relocating a constant from setup_constants to util_constants

BUG=1468838


Review URL: http://codereview.chromium.org/19680

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8928 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/chrome/installer/setup/setup.cc b/chrome/installer/setup/setup.cc
index 0fe3afb..046edd2 100755
--- a/chrome/installer/setup/setup.cc
+++ b/chrome/installer/setup/setup.cc
@@ -184,7 +184,7 @@ std::wstring installer::GetInstallerPathUnderChrome(
     const std::wstring& install_path, const std::wstring& new_version) {
   std::wstring installer_path(install_path);
   file_util::AppendToPath(&installer_path, new_version);
-  file_util::AppendToPath(&installer_path, installer::kInstallerDir);
+  file_util::AppendToPath(&installer_path, installer_util::kInstallerDir);
   return installer_path;
 }