- If the exe rename command fails try calling Google Update to do the same job. This works when we are logged into XP/Vista as limited rights user.

- Update Google Update idl file that has the recently added COM object.
- Add --system-level to the rename command that gets added to the registry.
- Remove all the code to uninstall Gears MSI. Now most of the user have been upgraded to Chrome installer that includes gears.dll.

BUG=1463346

Review URL: http://codereview.chromium.org/11255

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5791 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 13 insertions, 58 deletions

diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 7543212..1c17b81 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -228,7 +228,7 @@ bool installer::InstallNewVersion(const std::wstring& exe_path,
       } else {
         scoped_ptr<WorkItemList> inuse_list(WorkItem::CreateWorkItemList());
         inuse_list->AddSetRegValueWorkItem(reg_root,
-                                           version_key, 
+                                           version_key,
                                            google_update::kRegOldVersionField,
                                            current_version.c_str(),
                                            true);
@@ -236,10 +236,14 @@ bool installer::InstallNewVersion(const std::wstring& exe_path,
             install_path, new_version.GetString()));
         file_util::AppendToPath(&rename_cmd,
                                 file_util::GetFilenameFromPath(exe_path));
-        rename_cmd = L"\"" + rename_cmd + L"\" --" +
-                                  installer_util::switches::kRenameChromeExe;
+        rename_cmd = L"\"" + rename_cmd +
+                     L"\" --" + installer_util::switches::kRenameChromeExe;
+        if (reg_root == HKEY_LOCAL_MACHINE) {
+          rename_cmd = rename_cmd + L" --" +
+                       installer_util::switches::kSystemLevel;
+        }
         inuse_list->AddSetRegValueWorkItem(reg_root,
-                                           version_key, 
+                                           version_key,
                                            google_update::kRegRenameCmdField,
                                            rename_cmd.c_str(),
                                            true);
@@ -251,10 +255,10 @@ bool installer::InstallNewVersion(const std::wstring& exe_path,
       }
     } else {
       scoped_ptr<WorkItemList> inuse_list(WorkItem::CreateWorkItemList());
-      inuse_list->AddDeleteRegValueWorkItem(reg_root, version_key, 
+      inuse_list->AddDeleteRegValueWorkItem(reg_root, version_key,
                                             google_update::kRegOldVersionField,
                                             true);
-      inuse_list->AddDeleteRegValueWorkItem(reg_root, version_key, 
+      inuse_list->AddDeleteRegValueWorkItem(reg_root, version_key,
                                             google_update::kRegRenameCmdField,
                                             true);
       if (!inuse_list->Do()) {
diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc
index c3e417f..2332c8a 100755
--- a/chrome/installer/setup/main.cc
+++ b/chrome/installer/setup/main.cc
@@ -384,23 +384,6 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
         } else if (install_status == installer_util::NEW_VERSION_UPDATED) {
           // This is temporary hack and will be deleted after one release.
           UpdateChromeOpenCmd(system_install);
-
-#if defined(GOOGLE_CHROME_BUILD)
-          // TODO(kuchhal): This is just temporary until all users move to the
-          // new Chromium version which ships with gears.dll.
-          LOG(INFO) << "Google Chrome updated. Uninstalling gears msi.";
-          wchar_t product[39];  // GUID + '\0'
-          MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);  // Don't show any UI
-          for (int i = 0;
-               MsiEnumRelatedProducts(google_update::kGearsUpgradeCode, 0,
-                                      i, product) != ERROR_NO_MORE_ITEMS; ++i) {
-            LOG(INFO) << "Uninstalling Gears - " << product;
-            unsigned int ret = MsiConfigureProduct(product,
-                INSTALLLEVEL_MAXIMUM, INSTALLSTATE_ABSENT);
-            if (ret != ERROR_SUCCESS)
-              LOG(ERROR) << "Failed to uninstall Gears " << product;
-          }
-#endif
         }
       }
     }
diff --git a/chrome/installer/setup/setup.vsprops b/chrome/installer/setup/setup.vsprops
index 53258e4..e55085f 100644
--- a/chrome/installer/setup/setup.vsprops
+++ b/chrome/installer/setup/setup.vsprops
@@ -14,7 +14,6 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="msi.lib"
 		GenerateMapFile="true"
 		SubSystem="2"
 		OptimizeForWindows98="1"
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 27e8801..b9ca768 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -6,35 +6,19 @@
 
 #include "chrome/installer/setup/uninstall.h"
 
-#include <atlbase.h>
-#include <windows.h>
-#include <msi.h>
-
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
 #include "base/registry.h"
-#include "base/scoped_ptr.h"
 #include "base/string_util.h"
-#include "base/win_util.h"
-#include "base/wmi_util.h"
 #include "chrome/app/result_codes.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/installer/setup/setup.h"
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
-#include "chrome/installer/util/install_util.h"
-#include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/logging_installer.h"
-#include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/shell_util.h"
-#include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/version.h"
 
-#include "installer_util_strings.h"
-
 namespace {
 
 // This functions checks for any Chrome instances that are
@@ -119,9 +103,8 @@ bool DeleteFilesAndFolders(const std::wstring& exe_path, bool system_uninstall,
   LOG(INFO) << "Deleting install path " << install_path;
   if (!file_util::Delete(install_path, true)) {
     LOG(ERROR) << "Failed to delete folder (1st try): " << install_path;
-    // This is to let any closing chrome.exe die before trying delete one
-    // more time.
-    Sleep(10000);
+    // Try closing any running chrome processes and deleting files once again.
+    CloseAllChromeProcesses();
     if (!file_util::Delete(install_path, true))
       LOG(ERROR) << "Failed to delete folder (2nd try): " << install_path;
   }
@@ -218,20 +201,6 @@ installer_util::InstallStatus installer_setup::UninstallChrome(
     CloseAllChromeProcesses();
   }
 
-#if defined(GOOGLE_CHROME_BUILD)
-  // TODO(rahulk): This should be done by DoPreUninstallOperations call above
-  wchar_t product[39];  // GUID + '\0'
-  MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);  // Don't show any UI to user.
-  for (int i = 0; MsiEnumRelatedProducts(google_update::kGearsUpgradeCode, 0, i,
-                                         product) != ERROR_NO_MORE_ITEMS; ++i) {
-    LOG(INFO) << "Uninstalling Gears - " << product;
-    unsigned int ret = MsiConfigureProduct(product, INSTALLLEVEL_MAXIMUM,
-                                           INSTALLSTATE_ABSENT);
-    if (ret != ERROR_SUCCESS)
-      LOG(ERROR) << "Failed to uninstall Gears " << product << ": " << ret;
-  }
-#endif
-
   // Chrome is not in use so lets uninstall Chrome by deleting various files
   // and registry entries. Here we will just make best effort and keep going
   // in case of errors.
diff --git a/chrome/installer/util/google_update_constants.cc b/chrome/installer/util/google_update_constants.cc
index 4a1be5b..08ccefc 100644
--- a/chrome/installer/util/google_update_constants.cc
+++ b/chrome/installer/util/google_update_constants.cc
@@ -19,7 +19,7 @@ const wchar_t kRegLangField[] = L"lang";
 const wchar_t kRegLastCheckedField[] = L"LastChecked";
 const wchar_t kRegNameField[] = L"name";
 const wchar_t kRegOldVersionField[] = L"opv";
-const wchar_t kRegRenameCmdField[] = L"rename";
+const wchar_t kRegRenameCmdField[] = L"cmd";
 const wchar_t kRegRLZBrandField[] = L"brand";
 const wchar_t kRegUsageStatsField[] = L"usagestats";
 const wchar_t kRegVersionField[] = L"pv";