Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10517)

Unified Diff: chrome/installer/util/installation_validator_unittest.cc

Issue 103253004: Remove Chrome Frame quick-enable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment fix Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/installation_validator.cc ('k') | chrome/installer/util/util_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fffcf2bd8762e2e5cdb5348b50252f4a1e35e228..d5abb1392023f1622c62f8dc7a62bd04a8da6290 100644
--- a/chrome/installer/util/installation_validator_unittest.cc
+++ b/chrome/installer/util/installation_validator_unittest.cc
@@ -94,10 +94,6 @@ class FakeProductState : public ProductState {
Level install_level,
const char* version,
int channel_modifiers);
- void AddQuickEnableCfCommand(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;
}
@@ -298,27 +294,6 @@ void FakeProductState::AddQuickEnableApplicationHostCommand(
commands_.Set(installer::kCmdQuickEnableApplicationHost, app_cmd);
}
-// Adds the "quick-enable-cf" Google Update product command.
-void FakeProductState::AddQuickEnableCfCommand(
- 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);
- if (install_level == SYSTEM_LEVEL)
- cmd_line.AppendSwitch(installer::switches::kSystemLevel);
- cmd_line.AppendSwitch(installer::switches::kChromeFrameQuickEnable);
- AppCommand app_cmd(cmd_line.GetCommandLineString());
- app_cmd.set_sends_pings(true);
- app_cmd.set_is_web_accessible(true);
- commands_.Set(installer::kCmdQuickEnableCf, app_cmd);
-}
-
} // namespace
// Fixture for testing the InstallationValidator. Errors logged by the
@@ -501,10 +476,6 @@ void InstallationValidatorTest::MakeProductState(
channel_modifiers, vehicle);
state->set_multi_install(is_multi_install);
if (prod_type == BrowserDistribution::CHROME_BINARIES) {
- if (inst_type == InstallationValidator::CHROME_MULTI) {
- state->AddQuickEnableCfCommand(prod_type, install_level,
- chrome::kChromeVersion, channel_modifiers);
- }
state->AddQueryEULAAcceptanceCommand(prod_type,
install_level,
chrome::kChromeVersion,
« no previous file with comments | « chrome/installer/util/installation_validator.cc ('k') | chrome/installer/util/util_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698