| Index: chrome/installer/util/installation_validator_unittest.cc
|
| diff --git a/chrome/installer/util/installation_validator_unittest.cc b/chrome/installer/util/installation_validator_unittest.cc
|
| index 941dc5c23f64cf08571fc4869a11a5bf1aa20486..4faac2863121eacd0171c0d8b6cb1fc4307de380 100644
|
| --- a/chrome/installer/util/installation_validator_unittest.cc
|
| +++ b/chrome/installer/util/installation_validator_unittest.cc
|
| @@ -86,10 +86,6 @@ class FakeProductState : public ProductState {
|
| Level install_level,
|
| const char* version,
|
| int channel_modifiers);
|
| - void AddQuickEnableApplicationHostCommand(BrowserDistribution::Type dist_type,
|
| - Level install_level,
|
| - const char* version,
|
| - int channel_modifiers);
|
| void set_multi_install(bool is_multi_install) {
|
| multi_install_ = is_multi_install;
|
| }
|
| @@ -249,27 +245,6 @@ void FakeProductState::AddQueryEULAAcceptanceCommand(
|
| commands_.Set(installer::kCmdQueryEULAAcceptance, app_cmd);
|
| }
|
|
|
| -// Adds the "quick-enable-application-host" Google Update product command.
|
| -void FakeProductState::AddQuickEnableApplicationHostCommand(
|
| - BrowserDistribution::Type dist_type,
|
| - Level install_level,
|
| - const char* version,
|
| - int channel_modifiers) {
|
| - DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES);
|
| - DCHECK_NE(channel_modifiers & CM_MULTI, 0);
|
| -
|
| - CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version,
|
| - channel_modifiers));
|
| - cmd_line.AppendSwitch(installer::switches::kMultiInstall);
|
| - cmd_line.AppendSwitch(installer::switches::kChromeAppLauncher);
|
| - cmd_line.AppendSwitch(installer::switches::kEnsureGoogleUpdatePresent);
|
| - AppCommand app_cmd(cmd_line.GetCommandLineString());
|
| - app_cmd.set_sends_pings(true);
|
| - app_cmd.set_is_web_accessible(true);
|
| - app_cmd.set_is_run_as_user(true);
|
| - commands_.Set(installer::kCmdQuickEnableApplicationHost, app_cmd);
|
| -}
|
| -
|
| } // namespace
|
|
|
| // Fixture for testing the InstallationValidator. Errors logged by the
|
| @@ -457,12 +432,6 @@ void InstallationValidatorTest::MakeProductState(
|
| chrome::kChromeVersion,
|
| channel_modifiers);
|
| }
|
| - if (prod_type == BrowserDistribution::CHROME_BINARIES) {
|
| - state->AddQuickEnableApplicationHostCommand(prod_type,
|
| - install_level,
|
| - chrome::kChromeVersion,
|
| - channel_modifiers);
|
| - }
|
| if (prod_type == BrowserDistribution::CHROME_BROWSER) {
|
| state->AddOsUpgradeCommand(prod_type,
|
| install_level,
|
|
|