| Index: chrome/browser/first_run_win.cc
|
| diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc
|
| index 2f608b0709780ce9e5d30b12892c664adda1433a..6514d872f4b0c9005673fb1465f58806422be148 100644
|
| --- a/chrome/browser/first_run_win.cc
|
| +++ b/chrome/browser/first_run_win.cc
|
| @@ -118,7 +118,7 @@ bool LaunchSetupWithParam(const std::string& param, const std::wstring& value,
|
| exe_path = exe_path.Append(installer_util::kInstallerDir);
|
| exe_path = exe_path.Append(installer_util::kSetupExe);
|
| base::ProcessHandle ph;
|
| - CommandLine cl(exe_path.ToWStringHack());
|
| + CommandLine cl(exe_path);
|
| cl.AppendSwitchWithValue(param, value);
|
| if (!base::LaunchApp(cl, false, false, &ph))
|
| return false;
|
| @@ -563,7 +563,7 @@ bool DecodeImportParams(const std::wstring& encoded,
|
| bool FirstRun::ImportSettings(Profile* profile, int browser_type,
|
| int items_to_import, HWND parent_window) {
|
| const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
|
| - CommandLine import_cmd(cmdline.program());
|
| + CommandLine import_cmd(cmdline.GetProgram());
|
| // Propagate user data directory switch.
|
| if (cmdline.HasSwitch(switches::kUserDataDir)) {
|
| import_cmd.AppendSwitchWithValue(
|
|
|