Fix user-to-system-level installation delegation. This looks to have been bro...

chrome/installer/util/install_util.cc

 // Copyright (c) 2011 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/version.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/installation_state.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item_list.h"
 
 using base::win::RegKey;
+using installer::ProductState;
 
 bool InstallUtil::ExecuteExeAsAdmin(const CommandLine& cmd, DWORD* exit_code) {
   FilePath::StringType program(cmd.GetProgram().value());
   DCHECK(!program.empty());
   DCHECK_NE(program[0], L'\"');
 
   CommandLine::StringType params(cmd.command_line_string());
   if (params[0] == '"') {
     DCHECK_EQ('"', params[program.length() + 1]);
     DCHECK_EQ(program, params.substr(1, program.length()));
@@ skipping 18 matching lines @@
   ::WaitForSingleObject(info.hProcess, INFINITE);
   DWORD ret_val = 0;
   if (!::GetExitCodeProcess(info.hProcess, &ret_val))
     return false;
 
   if (exit_code)
     *exit_code = ret_val;
   return true;
 }
 
-std::wstring InstallUtil::GetChromeUninstallCmd(bool system_install,
-                                                BrowserDistribution* dist) {
-  DCHECK(dist);
-  HKEY root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-  RegKey key(root, dist->GetUninstallRegPath().c_str(), KEY_READ);
-  std::wstring uninstall_cmd;
-  key.ReadValue(installer::kUninstallStringField, &uninstall_cmd);
-  return uninstall_cmd;
+CommandLine InstallUtil::GetChromeUninstallCmd(
+    bool system_install, BrowserDistribution::Type distribution_type) {
+  ProductState state;

[tommi (sloooow) - chröme, 2011/02/10 20:52:37]

With this, now Chrome depends on the ProductState and I suspect some other parts
of the installer it didn't previously depend on.

Could we move this function out of the installer altogether?

It looks like GoogleChromeDistribution::InactiveUserToastExperiment is the only
thing in the installer that uses this function.
We could take that function out of the browserdistribution class and move it
into the installer and use ProductState there.  That way we also move the
experiment code out of Chrome.

[robertshield, 2011/02/10 21:09:39]

We could, but I'm not sure that's the best way to go just yet. The new
machine-state inspection code in Chrome has the advantage of being tested which
the code in Chrome isn't. I'd like to stick with using the one canonical way of
inspecting machine state (i.e. the InstallationState/ProductState code).

+  if (state.Initialize(system_install, distribution_type)) {
+    return state.uninstall_command();
+  }
+  return CommandLine(CommandLine::NO_PROGRAM);
 }
 
 Version* InstallUtil::GetChromeVersion(BrowserDistribution* dist,
                                        bool system_install) {
   DCHECK(dist);
   RegKey key;
   HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   LONG result = key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_READ);
 
   std::wstring version_str;
@@ skipping 166 matching lines @@
     std::wstring command;
     command.append(1, L'"')
         .append(no_program ? L"" : exe_path)
         .append(L"\" ")
         .append(arguments);
 
     // If we have a program name, return this complete command line.
     *command_line = CommandLine::FromString(command);
   }
 }