Fix some problems with machine level install.

BUG=2380

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

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

4 files changed, 0 insertions, 26 deletions

diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index c34dca8..914179c 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -26,9 +26,6 @@ void BrowserDistribution::DoPostUninstallOperations(
     const installer::Version& version) {
 }
 
-void BrowserDistribution::DoPreUninstallOperations() {
-}
-
 std::wstring BrowserDistribution::GetApplicationName() {
   return L"Chromium";
 }
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index e678417f..627ae75 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -19,8 +19,6 @@ class BrowserDistribution {
 
   virtual void DoPostUninstallOperations(const installer::Version& version);
 
-  virtual void DoPreUninstallOperations();
-
   virtual std::wstring GetApplicationName();
 
   virtual std::wstring GetInstallSubDir();
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index e9c7b01..f5ea433 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -73,25 +73,6 @@ void GoogleChromeDistribution::DoPostUninstallOperations(
   WMIProcessUtil::Launch(command, &pid);
 }
 
-// Uninstall Chrome specific Gears. First we find Gears MSI ProductId (that
-// changes with every new version of Gears) using Gears MSI UpgradeCode (that
-// does not change) and then uninstall Gears using API.
-void GoogleChromeDistribution::DoPreUninstallOperations() {
-  /* TODO(rahulk) this comment is commented for now because it is causing extra
-  dependencies for the renderer. Need to remove ifdef from uninstall.cc and
-  uncomment this function.
-  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;
-  }*/
-}
-
 std::wstring GoogleChromeDistribution::GetApplicationName() {
   const std::wstring& product_name =
       installer_util::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index 9b15180..9e803e0 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -15,8 +15,6 @@ class GoogleChromeDistribution : public BrowserDistribution {
  public:
   virtual void DoPostUninstallOperations(const installer::Version& version);
 
-  virtual void DoPreUninstallOperations();
-
   virtual std::wstring GetApplicationName();
 
   virtual std::wstring GetInstallSubDir();