More installer refactoring in the interest of fixing some bugs and cleaning t...

chrome/browser/first_run/first_run_win.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.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <set>
 #include <sstream>
 
 #include "app/app_switches.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/object_watcher.h"
-#include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/views/first_run_search_engine_view.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/worker_thread_ticker.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
+#include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "google_update_idl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/link.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
 #include "views/window/window.h"
 
 namespace {
 
 bool GetNewerChromeFile(FilePath* path) {
   if (!PathService::Get(base::DIR_EXE, path))
     return false;
   *path = path->Append(installer::kChromeNewExe);
   return true;
 }
 
-bool InvokeGoogleUpdateForRename() {
+bool InvokeGoogleUpdateForRename(const std::wstring& app_guid) {
   ScopedComPtr<IProcessLauncher> ipl;
   if (!FAILED(ipl.CreateInstance(__uuidof(ProcessLauncherClass)))) {
     ULONG_PTR phandle = NULL;
     DWORD id = GetCurrentProcessId();
-    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-    if (!FAILED(ipl->LaunchCmdElevated(dist->GetAppGuid().c_str(),
+    if (!FAILED(ipl->LaunchCmdElevated(app_guid.c_str(),
                                        google_update::kRegRenameCmdField,
                                        id, &phandle))) {
       HANDLE handle = HANDLE(phandle);
       WaitForSingleObject(handle, INFINITE);
       DWORD exit_code;
       ::GetExitCodeProcess(handle, &exit_code);
       ::CloseHandle(handle);
       if (exit_code == installer::RENAME_SUCCESSFUL)
         return true;
     }
@@ skipping 172 matching lines @@
   return base::LaunchApp(command_line.command_line_string(),
                          false, false, NULL);
 }
 
 bool Upgrade::SwapNewChromeExeIfPresent() {
   FilePath new_chrome_exe;
   if (!GetNewerChromeFile(&new_chrome_exe))
     return false;
   if (!file_util::PathExists(new_chrome_exe))
     return false;
-  FilePath cur_chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &cur_chrome_exe))
-    return false;
+  std::wstring app_guid;
+  std::wstring rename_cmd = installer::GetRenameCommand(&app_guid);

[tommi (sloooow) - chröme, 2011/01/21 21:45:17]

general style nit: We prefer std::string foo(Bar()); to std::string foo ==
Bar();

 
-  // First try to rename exe by launching rename command ourselves.
-  bool user_install =
-      InstallUtil::IsPerUserInstall(cur_chrome_exe.value().c_str());
-  HKEY reg_root = user_install ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
-  BrowserDistribution *dist = BrowserDistribution::GetDistribution();
-  base::win::RegKey key;
-  std::wstring rename_cmd;
-  if ((key.Open(reg_root, dist->GetVersionKey().c_str(),
-                KEY_READ) == ERROR_SUCCESS) &&
-      (key.ReadValue(google_update::kRegRenameCmdField,
-                     &rename_cmd) == ERROR_SUCCESS)) {
+  if (!rename_cmd.empty()) {
     base::ProcessHandle handle;
     if (base::LaunchApp(rename_cmd, true, true, &handle)) {
       DWORD exit_code;
       ::GetExitCodeProcess(handle, &exit_code);
       ::CloseHandle(handle);
       if (exit_code == installer::RENAME_SUCCESSFUL)
         return true;
     }
+  } else {
+    NOTREACHED() << "Empty command string found to rename new chrome.";
   }
 
   // Rename didn't work so try to rename by calling Google Update
-  return InvokeGoogleUpdateForRename();
+  return InvokeGoogleUpdateForRename(app_guid);
 }
 
 // static
 bool Upgrade::DoUpgradeTasks(const CommandLine& command_line) {
   if (!Upgrade::SwapNewChromeExeIfPresent())
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!Upgrade::RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
@@ skipping 549 matching lines @@
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td(version);
   return td.ShowModal();
 }