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, 5 insertions, 4 deletions

diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index 21e29f9..ec747a2 100755
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -116,12 +116,13 @@ bool InvokeGoogleUpdateForRename() {
 }
 
 bool LaunchSetupWithParam(const std::wstring& param, int* ret_code) {
-  std::wstring exe_path;
-  if (!PathService::Get(base::DIR_EXE, &exe_path))
+  FilePath exe_path;
+  if (!PathService::Get(base::DIR_MODULE, &exe_path))
     return false;
-  file_util::AppendToPath(&exe_path, installer_util::kSetupExe);
+  exe_path.Append(installer_util::kInstallerDir);
+  exe_path.Append(installer_util::kSetupExe);
   base::ProcessHandle ph;
-  CommandLine cl(exe_path);
+  CommandLine cl(exe_path.ToWStringHack());
   cl.AppendSwitch(param);
   if (!base::LaunchApp(cl, false, false, &ph))
     return false;