Remove BrowserDistribution::Type.

chrome/installer/util/install_util.cc

 // Copyright (c) 2012 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>
@@ skipping 16 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item_list.h"
 
 using base::win::RegKey;
 using installer::ProductState;
 
 namespace {
 
@@ skipping 512 matching lines @@
 
 // static
 void InstallUtil::AddUpdateDowngradeVersionItem(
     bool system_install,
     const base::Version* current_version,
     const base::Version& new_version,
     const BrowserDistribution* dist,
     WorkItemList* list) {
   DCHECK(list);
   DCHECK(dist);
-  DCHECK_EQ(BrowserDistribution::CHROME_BROWSER, dist->GetType());
   base::Version downgrade_version = GetDowngradeVersion(system_install, dist);
   HKEY root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   if (!current_version ||
       (*current_version <= new_version &&
        ((!downgrade_version.IsValid() || downgrade_version <= new_version)))) {
     list->AddDeleteRegValueWorkItem(root, dist->GetStateKey(), KEY_WOW64_32KEY,
                                     kRegDowngradeVersion);
   } else if (*current_version > new_version && !downgrade_version.IsValid()) {
     list->AddSetRegValueWorkItem(
         root, dist->GetStateKey(), KEY_WOW64_32KEY, kRegDowngradeVersion,
@@ skipping 48 matching lines @@
   // Open the program and see if it references the expected file.
   base::File file;
   BY_HANDLE_FILE_INFORMATION info = {};
 
   return (OpenForInfo(path, &file) &&
           GetInfo(file, &info) &&
           info.dwVolumeSerialNumber == file_info_.dwVolumeSerialNumber &&
           info.nFileIndexHigh == file_info_.nFileIndexHigh &&
           info.nFileIndexLow == file_info_.nFileIndexLow);
 }