Attempt to reland http://codereview.chromium.org/4928002/...

chrome/installer/util/install_util.cc

 // Copyright (c) 2010 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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <algorithm>
 
-#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item_list.h"
 
 using base::win::RegKey;
 using installer_util::MasterPreferences;
 
 const MasterPreferences& InstallUtil::GetMasterPreferencesForCurrentProcess() {
   static MasterPreferences prefs(*CommandLine::ForCurrentProcess());
   return prefs;
 }
 
-bool InstallUtil::ExecuteExeAsAdmin(const std::wstring& exe,
-                                    const std::wstring& params,
-                                    DWORD* exit_code) {
+bool InstallUtil::ExecuteExeAsAdmin(const CommandLine& cmd, DWORD* exit_code) {
+  FilePath::StringType program(cmd.GetProgram().value());
+  DCHECK(!program.empty());
+  DCHECK(program[0] != '\"');
+
+  CommandLine::StringType params(cmd.command_line_string());
+  if (params[0] == '"') {
+    DCHECK_EQ('"', params[program.length() + 1]);
+    DCHECK_EQ(program, params.substr(1, program.length()));
+    params = params.substr(program.length() + 2);
+  } else {
+    DCHECK_EQ(program, params.substr(0, program.length()));
+    params = params.substr(program.length());
+  }
+
+  TrimWhitespace(params, TRIM_ALL, &params);
+
   SHELLEXECUTEINFO info = {0};
   info.cbSize = sizeof(SHELLEXECUTEINFO);
   info.fMask = SEE_MASK_NOCLOSEPROCESS;
   info.lpVerb = L"runas";
-  info.lpFile = exe.c_str();
+  info.lpFile = program.c_str();
   info.lpParameters = params.c_str();
   info.nShow = SW_SHOW;
   if (::ShellExecuteEx(&info) == FALSE)
     return false;
 
   ::WaitForSingleObject(info.hProcess, INFINITE);
   DWORD ret_val = 0;
   if (!::GetExitCodeProcess(info.hProcess, &ret_val))
     return false;
 
@@ skipping 201 matching lines @@
                                       const std::wstring& value_name) {
   RegKey key(reg_root, key_path.c_str(), KEY_ALL_ACCESS);
   VLOG(1) << "Deleting registry value " << value_name;
   if (key.ValueExists(value_name.c_str()) &&
       !key.DeleteValue(value_name.c_str())) {
     LOG(ERROR) << "Failed to delete registry value: " << value_name;
     return false;
   }
   return true;
 }