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

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

Issue 8909009: Remove remaining references to CEEE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync'ed source code, no new changes for this CL Created 9 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
Index: chrome/installer/util/master_preferences_unittest.cc
===================================================================
--- chrome/installer/util/master_preferences_unittest.cc (revision 114621)
+++ chrome/installer/util/master_preferences_unittest.cc (working copy)
@@ -303,87 +303,54 @@
}
TEST_F(MasterPreferencesTest, TestDefaultInstallConfig) {
- std::wstringstream chrome_cmd, cf_cmd, ceee_cmd;
+ std::wstringstream chrome_cmd, cf_cmd;
chrome_cmd << "setup.exe";
cf_cmd << "setup.exe --" << installer::switches::kChromeFrame;
- ceee_cmd << "setup.exe --" << installer::switches::kCeee;
CommandLine chrome_install(CommandLine::FromString(chrome_cmd.str()));
CommandLine cf_install(CommandLine::FromString(cf_cmd.str()));
- CommandLine ceee_install(CommandLine::FromString(ceee_cmd.str()));
installer::MasterPreferences pref_chrome(chrome_install);
installer::MasterPreferences pref_cf(cf_install);
- installer::MasterPreferences pref_ceee(ceee_install);
EXPECT_FALSE(pref_chrome.is_multi_install());
EXPECT_TRUE(pref_chrome.install_chrome());
- EXPECT_FALSE(pref_chrome.install_ceee());
EXPECT_FALSE(pref_chrome.install_chrome_frame());
EXPECT_FALSE(pref_cf.is_multi_install());
EXPECT_FALSE(pref_cf.install_chrome());
- EXPECT_FALSE(pref_cf.install_ceee());
EXPECT_TRUE(pref_cf.install_chrome_frame());
-
- EXPECT_FALSE(pref_ceee.is_multi_install());
- EXPECT_FALSE(pref_ceee.install_chrome());
- EXPECT_TRUE(pref_ceee.install_ceee());
- EXPECT_TRUE(pref_ceee.install_chrome_frame());
}
TEST_F(MasterPreferencesTest, TestMultiInstallConfig) {
using installer::switches::kMultiInstall;
using installer::switches::kChrome;
using installer::switches::kChromeFrame;
- using installer::switches::kCeee;
- std::wstringstream chrome_cmd, cf_cmd, ceee_cmd, chrome_cf_cmd,
- chrome_ceee_cf_cmd;
+ std::wstringstream chrome_cmd, cf_cmd, chrome_cf_cmd;
chrome_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome;
cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChromeFrame;
- ceee_cmd << "setup.exe --" << kMultiInstall << " --" << kCeee;
chrome_cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome <<
" --" << kChromeFrame;
- chrome_ceee_cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome <<
- " --" << kChromeFrame << " --" << kCeee;
CommandLine chrome_install(CommandLine::FromString(chrome_cmd.str()));
CommandLine cf_install(CommandLine::FromString(cf_cmd.str()));
- CommandLine ceee_install(CommandLine::FromString(ceee_cmd.str()));
CommandLine chrome_cf_install(CommandLine::FromString(chrome_cf_cmd.str()));
- CommandLine chrome_cf_ceee_install(
- CommandLine::FromString(chrome_ceee_cf_cmd.str()));
installer::MasterPreferences pref_chrome(chrome_install);
installer::MasterPreferences pref_cf(cf_install);
- installer::MasterPreferences pref_ceee(ceee_install);
installer::MasterPreferences pref_chrome_cf(chrome_cf_install);
- installer::MasterPreferences pref_all(chrome_cf_ceee_install);
EXPECT_TRUE(pref_chrome.is_multi_install());
EXPECT_TRUE(pref_chrome.install_chrome());
- EXPECT_FALSE(pref_chrome.install_ceee());
EXPECT_FALSE(pref_chrome.install_chrome_frame());
EXPECT_TRUE(pref_cf.is_multi_install());
EXPECT_FALSE(pref_cf.install_chrome());
- EXPECT_FALSE(pref_cf.install_ceee());
EXPECT_TRUE(pref_cf.install_chrome_frame());
- EXPECT_TRUE(pref_ceee.is_multi_install());
- EXPECT_FALSE(pref_ceee.install_chrome());
- EXPECT_TRUE(pref_ceee.install_ceee());
- EXPECT_TRUE(pref_ceee.install_chrome_frame());
-
EXPECT_TRUE(pref_chrome_cf.is_multi_install());
EXPECT_TRUE(pref_chrome_cf.install_chrome());
- EXPECT_FALSE(pref_chrome_cf.install_ceee());
EXPECT_TRUE(pref_chrome_cf.install_chrome_frame());
-
- EXPECT_TRUE(pref_all.is_multi_install());
- EXPECT_TRUE(pref_all.install_chrome());
- EXPECT_TRUE(pref_all.install_ceee());
- EXPECT_TRUE(pref_all.install_chrome_frame());
}

Powered by Google App Engine
This is Rietveld 408576698