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

chrome/installer/util/package.cc

Index: chrome/installer/util/package.cc
===================================================================
--- chrome/installer/util/package.cc	(revision 71802)
+++ chrome/installer/util/package.cc	(working copy)
@@ -1,188 +0,0 @@
-// 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.
-
-#include "chrome/installer/util/package.h"
-
-#include "base/file_util.h"
-#include "base/logging.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "base/win/registry.h"
-#include "chrome/installer/util/delete_tree_work_item.h"
-#include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/helper.h"
-#include "chrome/installer/util/master_preferences.h"
-#include "chrome/installer/util/package_properties.h"
-#include "chrome/installer/util/product.h"
-#include "chrome/installer/util/util_constants.h"
-#include "chrome/installer/util/work_item_list.h"
-
-using base::win::RegKey;
-using installer::MasterPreferences;
-
-namespace installer {
-
-Package::Package(bool multi_install, bool system_level, const FilePath& path,
-                 PackageProperties* properties)
-    : multi_install_(multi_install),
-      system_level_(system_level),
-      path_(path),
-      properties_(properties) {
-  DCHECK(properties_);
-}
-
-Package::~Package() {
-}
-
-const FilePath& Package::path() const {
-  return path_;
-}
-
-const Products& Package::products() const {
-  return products_;
-}
-
-PackageProperties* Package::properties() const {
-  return properties_;
-}
-
-bool Package::IsEqual(const FilePath& path) const {
-  return FilePath::CompareEqualIgnoreCase(path_.value(), path.value());
-}
-
-void Package::AssociateProduct(const Product* product) {
-#ifndef NDEBUG
-  for (size_t i = 0; i < products_.size(); ++i) {
-    DCHECK_NE(product->distribution()->GetType(),
-              products_[i]->distribution()->GetType());
-  }
-#endif
-  products_.push_back(product);
-}
-
-bool Package::multi_install() const {
-  return multi_install_;
-}
-
-bool Package::system_level() const {
-  return system_level_;
-}
-
-FilePath Package::GetInstallerDirectory(
-    const Version& version) const {
-  return path_.Append(UTF8ToWide(version.GetString()))
-      .Append(installer::kInstallerDir);
-}
-
-Version* Package::GetCurrentVersion() const {
-  scoped_ptr<Version> current_version;
-  // Be aware that there might be a pending "new_chrome.exe" already in the
-  // installation path.
-  FilePath new_chrome_exe(path_.Append(installer::kChromeNewExe));
-  bool new_chrome_exists = file_util::PathExists(new_chrome_exe);
-
-  HKEY root = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-
-  for (size_t i = 0; i < products_.size(); ++i) {
-    const Product* product = products_[i];
-    RegKey chrome_key(root, product->distribution()->GetVersionKey().c_str(),
-                      KEY_READ);
-    std::wstring version;
-    if (new_chrome_exists)
-      chrome_key.ReadValue(google_update::kRegOldVersionField, &version);
-
-    if (version.empty())
-      chrome_key.ReadValue(google_update::kRegVersionField, &version);
-
-    if (!version.empty()) {
-      scoped_ptr<Version> this_version(Version::GetVersionFromString(
-                                           WideToASCII(version)));
-      if (this_version.get()) {
-        if (!current_version.get() ||
-            (current_version->CompareTo(*this_version) > 0)) {
-          current_version.reset(this_version.release());
-        } else if (current_version.get()) {
-          DCHECK_EQ(current_version->GetString(), this_version->GetString())
-              << "found distributions of different versions in the same "
-                 "installation folder!";
-        }
-      }
-    }
-  }
-
-  return current_version.release();
-}
-
-void Package::RemoveOldVersionDirectories(
-    const Version& latest_version) const {
-  file_util::FileEnumerator version_enum(path_, false,
-      file_util::FileEnumerator::DIRECTORIES);
-  scoped_ptr<Version> version;
-
-  // We try to delete all directories whose versions are lower than
-  // latest_version.
-  FilePath next_version = version_enum.Next();
-  while (!next_version.empty()) {
-    file_util::FileEnumerator::FindInfo find_data = {0};
-    version_enum.GetFindInfo(&find_data);
-    VLOG(1) << "directory found: " << find_data.cFileName;
-    version.reset(Version::GetVersionFromString(
-                      WideToASCII(find_data.cFileName)));
-    if (version.get() && (latest_version.CompareTo(*version) > 0)) {
-      std::vector<FilePath> key_files;
-      for (Products::const_iterator it = products_.begin();
-          it != products_.end(); ++it) {
-        BrowserDistribution* dist = it->get()->distribution();
-        std::vector<FilePath> dist_key_files(dist->GetKeyFiles());
-        std::vector<FilePath>::const_iterator key_file_iter(
-            dist_key_files.begin());
-        for (; key_file_iter != dist_key_files.end(); ++key_file_iter) {
-          key_files.push_back(next_version.Append(*key_file_iter));
-        }
-      }
-
-      VLOG(1) << "Deleting directory: " << next_version.value();
-
-      scoped_ptr<DeleteTreeWorkItem> item(
-          WorkItem::CreateDeleteTreeWorkItem(next_version, key_files));
-      if (!item->Do())
-        item->Rollback();
-    }
-
-    next_version = version_enum.Next();
-  }
-}
-
-size_t Package::GetMultiInstallDependencyCount() const {
-  BrowserDistribution::Type product_types[] = {
-    BrowserDistribution::CHROME_BROWSER,
-    BrowserDistribution::CHROME_FRAME,
-  };
-
-  const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
-  HKEY root_key = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-
-  size_t ret = 0;
-
-  for (int i = 0; i < arraysize(product_types); ++i) {
-    BrowserDistribution* dist =
-        BrowserDistribution::GetSpecificDistribution(product_types[i], prefs);
-    // First see if the product is installed by checking its version key.
-    // If the key doesn't exist, the product isn't installed.
-    RegKey version_key(root_key, dist->GetVersionKey().c_str(), KEY_READ);
-    if (!version_key.Valid()) {
-      VLOG(1) << "Product not installed: " << dist->GetApplicationName();
-    } else {
-      if (installer::IsInstalledAsMulti(system_level_, dist)) {
-        VLOG(1) << "Product dependency: " << dist->GetApplicationName();
-        ++ret;
-      }
-    }
-  }
-
-  return ret;
-}
-
-}  // namespace installer
-