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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/installer/setup/install_worker_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/setup/install_worker.cc ('k') | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker_unittest.cc
diff --git a/chrome/installer/setup/install_worker_unittest.cc b/chrome/installer/setup/install_worker_unittest.cc
index a9d3a9eb58adbe57e6ff4c81f2d21146c0afac1a..81db6032790467275a64344a5f097a2aba4838bf 100644
--- a/chrome/installer/setup/install_worker_unittest.cc
+++ b/chrome/installer/setup/install_worker_unittest.cc
@@ -714,178 +714,9 @@ const wchar_t QuickEnableAbsentTest::kRegKeyPath[] =
TEST_F(QuickEnableAbsentTest, CleanInstallSingleChrome) {
// Install single Chrome on a clean system.
scoped_ptr<MockInstallerState> installer_state(
- BuildChromeInstallerState(system_level_, false, *machine_state_,
- InstallerState::SINGLE_INSTALL_OR_UPDATE));
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
-}
-
-TEST_F(QuickEnableAbsentTest, CleanInstallSingleChromeFrame) {
- // Install single Chrome Frame on a clean system.
- scoped_ptr<MockInstallerState> installer_state(
- BuildChromeFrameInstallerState(system_level_, false, *machine_state_,
- InstallerState::SINGLE_INSTALL_OR_UPDATE));
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
-}
-
-TEST_F(QuickEnableAbsentTest, CleanInstallMultiChromeFrame) {
- // Install multi Chrome Frame on a clean system.
- scoped_ptr<MockInstallerState> installer_state(
- BuildChromeFrameInstallerState(system_level_, true, *machine_state_,
- InstallerState::MULTI_INSTALL));
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
-}
-
-TEST_F(QuickEnableAbsentTest, CleanInstallMultiChromeChromeFrame) {
- // Install multi Chrome and Chrome Frame on a clean system.
- scoped_ptr<MockInstallerState> installer_state(
- BuildBasicInstallerState(system_level_, true, *machine_state_,
- InstallerState::MULTI_INSTALL));
- AddChromeBinariesToInstallerState(*machine_state_, installer_state.get());
- AddChromeToInstallerState(*machine_state_, installer_state.get());
- AddChromeFrameToInstallerState(*machine_state_, installer_state.get());
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
-}
-
-TEST_F(QuickEnableAbsentTest, UninstallMultiChromeLeaveMultiChromeFrame) {
- // Uninstall multi Chrome on a machine with multi Chrome Frame.
- AddChromeToInstallationState(system_level_, true, machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, true, machine_state_.get());
- scoped_ptr<MockInstallerState> installer_state(
- BuildBasicInstallerState(system_level_, true, *machine_state_,
- InstallerState::UNINSTALL));
- AddChromeToInstallerState(*machine_state_, installer_state.get());
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
-}
-
-TEST_F(QuickEnableAbsentTest, UninstallMultiChromeLeaveSingleChromeFrame) {
- // Uninstall multi Chrome on a machine with single Chrome Frame.
- AddChromeToInstallationState(system_level_, true, machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, false, machine_state_.get());
- scoped_ptr<MockInstallerState> installer_state(
- BuildBasicInstallerState(system_level_, true, *machine_state_,
- InstallerState::UNINSTALL));
- AddChromeToInstallerState(*machine_state_, installer_state.get());
- AddChromeBinariesToInstallerState(*machine_state_, installer_state.get());
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
-}
-
-// Test scenarios under which the quick-enable-cf command should exist after the
-// run.
-class QuickEnablePresentTest : public InstallWorkerTest {
- public:
- virtual void SetUp() {
- InstallWorkerTest::SetUp();
- root_key_ = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
- create_reg_key_work_item_.reset(
- WorkItem::CreateCreateRegKeyWorkItem(root_key_, kRegKeyPath));
- set_reg_value_work_item_.reset(
- WorkItem::CreateSetRegValueWorkItem(root_key_, kRegKeyPath, L"", L"",
- false));
- machine_state_.reset(new MockInstallationState());
- EXPECT_CALL(work_item_list_,
- AddCreateRegKeyWorkItem(Eq(root_key_), StrCaseEq(kRegKeyPath)))
- .Times(1)
- .WillOnce(Return(create_reg_key_work_item_.get()));
- EXPECT_CALL(work_item_list_,
- AddSetRegStringValueWorkItem(Eq(root_key_),
- StrCaseEq(kRegKeyPath),
- StrEq(L"CommandLine"), _,
- Eq(true)))
- .Times(1)
- .WillOnce(Return(set_reg_value_work_item_.get()));
- EXPECT_CALL(work_item_list_,
- AddSetRegDwordValueWorkItem(Eq(root_key_),
- StrCaseEq(kRegKeyPath), _,
- Eq(static_cast<DWORD>(1)),
- Eq(true)))
- .Times(2)
- .WillRepeatedly(Return(set_reg_value_work_item_.get()));
- }
- virtual void TearDown() {
- machine_state_.reset();
- set_reg_value_work_item_.reset();
- create_reg_key_work_item_.reset();
- root_key_ = NULL;
- InstallWorkerTest::TearDown();
- }
- protected:
- static const bool system_level_ = false;
- static const wchar_t kRegKeyPath[];
- HKEY root_key_;
- scoped_ptr<CreateRegKeyWorkItem> create_reg_key_work_item_;
- scoped_ptr<SetRegValueWorkItem> set_reg_value_work_item_;
- scoped_ptr<MockInstallationState> machine_state_;
- StrictMock<MockWorkItemList> work_item_list_;
-};
-
-const wchar_t QuickEnablePresentTest::kRegKeyPath[] =
- L"Software\\Google\\Update\\Clients\\"
- L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}\\Commands\\quick-enable-cf";
-
-TEST_F(QuickEnablePresentTest, CleanInstallMultiChrome) {
- // Install multi Chrome on a clean system.
- scoped_ptr<MockInstallerState> installer_state(
- BuildChromeInstallerState(system_level_, true, *machine_state_,
- InstallerState::MULTI_INSTALL));
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
-}
-
-TEST_F(QuickEnablePresentTest, UninstallSingleChromeFrame) {
- // Uninstall single Chrome Frame on a machine with multi Chrome.
- AddChromeToInstallationState(system_level_, true, machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, false, machine_state_.get());
- scoped_ptr<MockInstallerState> installer_state(
- BuildBasicInstallerState(system_level_, false, *machine_state_,
- InstallerState::UNINSTALL));
- AddChromeFrameToInstallerState(*machine_state_, installer_state.get());
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
-}
-
-TEST_F(QuickEnablePresentTest, UninstallMultiChromeFrame) {
- // Uninstall multi Chrome Frame on a machine with multi Chrome.
- AddChromeToInstallationState(system_level_, true, machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, true, machine_state_.get());
- scoped_ptr<MockInstallerState> installer_state(
BuildBasicInstallerState(system_level_, true, *machine_state_,
- InstallerState::UNINSTALL));
- AddChromeFrameToInstallerState(*machine_state_, installer_state.get());
- AddQuickEnableChromeFrameWorkItems(*installer_state,
- *machine_state_,
- setup_path_,
- *new_version_.get(),
- &work_item_list_);
+ InstallerState::MULTI_UPDATE));
+ AddQuickEnableChromeFrameWorkItems(*installer_state, &work_item_list_);
}
TEST_F(InstallWorkerTest, WillProductBePresentAfterSetup) {
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698