Skip to content

Commit

Permalink
Remove the installation validator.
Browse files Browse the repository at this point in the history
The tests in chrome/test/mini_installer are the path forward for
ensuring that the installer does the right thing.

BUG=none
R=robertshield@chromium.org

Review-Url: https://codereview.chromium.org/2456863002
Cr-Commit-Position: refs/heads/master@{#428302}
  • Loading branch information
GregTho authored and Commit bot committed Oct 28, 2016
1 parent c01829c commit faaf101
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 1,497 deletions.
11 changes: 0 additions & 11 deletions chrome/installer/setup/setup_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
#include "chrome/installer/util/html_dialog.h"
#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/installation_state.h"
#include "chrome/installer/util/installation_validator.h"
#include "chrome/installer/util/installer_state.h"
#include "chrome/installer/util/installer_util_strings.h"
#include "chrome/installer/util/l10n_string_util.h"
Expand All @@ -88,7 +87,6 @@

using installer::InstallerState;
using installer::InstallationState;
using installer::InstallationValidator;
using installer::MasterPreferences;
using installer::Product;
using installer::ProductState;
Expand Down Expand Up @@ -1967,15 +1965,6 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
&installer_state, &installer_directory);
}

// Validate that the machine is now in a good state following the operation.
// TODO(grt): change this to log at DFATAL once we're convinced that the
// validator handles all cases properly.
InstallationValidator::InstallationType installation_type =
InstallationValidator::NO_PRODUCTS;
LOG_IF(ERROR,
!InstallationValidator::ValidateInstallationType(system_install,
&installation_type));

UMA_HISTOGRAM_ENUMERATION("Setup.Install.Result", install_status,
installer::MAX_INSTALL_STATUS);

Expand Down
5 changes: 0 additions & 5 deletions chrome/installer/util/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ static_library("with_no_strings") {
"google_chrome_distribution.h",
"html_dialog.h",
"html_dialog_impl.cc",
"installation_validator.cc",
"installation_validator.h",
"logging_installer.cc",
"logging_installer.h",
"lzma_file_allocator.cc",
Expand Down Expand Up @@ -303,9 +301,6 @@ if (is_win) {
"fake_product_state.h",
"google_update_settings_unittest.cc",
"install_util_unittest.cc",
"installation_validation_helper.cc",
"installation_validation_helper.h",
"installation_validator_unittest.cc",
"installer_state_unittest.cc",
"installer_util_test_common.cc",
"installer_util_test_common.h",
Expand Down
138 changes: 0 additions & 138 deletions chrome/installer/util/installation_validation_helper.cc

This file was deleted.

44 changes: 0 additions & 44 deletions chrome/installer/util/installation_validation_helper.h

This file was deleted.

Loading

0 comments on commit faaf101

Please sign in to comment.