Chromium Code Reviews| Index: remoting/host/plugin/daemon_installer_win.cc |
| diff --git a/remoting/host/plugin/daemon_installer_win.cc b/remoting/host/plugin/daemon_installer_win.cc |
| index a5454321ede3c360f3d258f9d76b0961471b1cc8..606c1c8f13c76a269253e8c54dfec9decc1d25ad 100644 |
| --- a/remoting/host/plugin/daemon_installer_win.cc |
| +++ b/remoting/host/plugin/daemon_installer_win.cc |
| @@ -285,24 +285,23 @@ void DaemonCommandLineInstallerWin::Install() { |
| return; |
| } |
| + // presubmit: allow wstring |
| std::wstring google_update; |
| - result = update_key.ReadValue(kOmahaPathValueName, |
| - &google_update); |
| + result = update_key.ReadValue(kOmahaPathValueName, &google_update); |
| if (result != ERROR_SUCCESS) { |
| Done(HRESULT_FROM_WIN32(result)); |
| return; |
| } |
| // Launch the updater process and wait for its termination. |
| - std::wstring command_line = |
| + string16 command_line = WideToUTF16( |
|
Wez
2012/08/06 18:33:18
We only need to printf wide and convert because go
alexeypa (please no reviews)
2012/08/06 19:31:54
There is no string16 version of printf, only acsii
|
| StringPrintf(kGoogleUpdateCommandLineFormat, |
| google_update.c_str(), |
| kHostOmahaAppid, |
| - kOmahaLanguage); |
| + kOmahaLanguage)); |
| base::LaunchOptions options; |
| - if (!base::LaunchProcess(WideToUTF16(command_line), options, |
| - process_.Receive())) { |
| + if (!base::LaunchProcess(command_line, options, process_.Receive())) { |
| result = GetLastError(); |
| Done(HRESULT_FROM_WIN32(result)); |
| return; |