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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/installer/setup/install_worker_unittest.cc

Issue 110163004: Remove Chrome Frame ready-mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile fixes for mini_installer_test 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') | chrome/installer/util/installation_validator_unittest.cc » ('J')
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 0d63f0f65a98cfb0677b1cfa28a70f1b14de64e5..a9d3a9eb58adbe57e6ff4c81f2d21146c0afac1a 100644
--- a/chrome/installer/setup/install_worker_unittest.cc
+++ b/chrome/installer/setup/install_worker_unittest.cc
@@ -220,7 +220,6 @@ class InstallWorkerTest : public testing::Test {
void AddChromeToInstallationState(
bool system_level,
bool multi_install,
- bool with_chrome_frame_ready_mode,
MockInstallationState* installation_state) {
if (multi_install)
MaybeAddBinariesToInstallationState(system_level, installation_state);
@@ -244,11 +243,6 @@ class InstallWorkerTest : public testing::Test {
if (multi_install) {
product_state.AddUninstallSwitch(installer::switches::kMultiInstall);
product_state.AddUninstallSwitch(installer::switches::kChrome);
- if (with_chrome_frame_ready_mode) {
- product_state.AddUninstallSwitch(installer::switches::kChromeFrame);
- product_state.AddUninstallSwitch(
- installer::switches::kChromeFrameReadyMode);
- }
}
installation_state->SetProductState(system_level,
@@ -259,7 +253,6 @@ class InstallWorkerTest : public testing::Test {
void AddChromeFrameToInstallationState(
bool system_level,
bool multi_install,
- bool ready_mode,
MockInstallationState* installation_state) {
if (multi_install)
MaybeAddBinariesToInstallationState(system_level, installation_state);
@@ -280,13 +273,8 @@ class InstallWorkerTest : public testing::Test {
product_state.AddUninstallSwitch(installer::switches::kChromeFrame);
if (system_level)
product_state.AddUninstallSwitch(installer::switches::kSystemLevel);
- if (multi_install) {
+ if (multi_install)
product_state.AddUninstallSwitch(installer::switches::kMultiInstall);
- if (ready_mode) {
- product_state.AddUninstallSwitch(
- installer::switches::kChromeFrameReadyMode);
- }
- }
installation_state->SetProductState(system_level,
BrowserDistribution::CHROME_FRAME,
@@ -297,7 +285,7 @@ class InstallWorkerTest : public testing::Test {
bool multi_install) {
scoped_ptr<MockInstallationState> installation_state(
new MockInstallationState());
- AddChromeToInstallationState(system_level, multi_install, false,
+ AddChromeToInstallationState(system_level, multi_install,
installation_state.get());
return installation_state.release();
}
@@ -373,7 +361,6 @@ class InstallWorkerTest : public testing::Test {
static void AddChromeFrameToInstallerState(
const InstallationState& machine_state,
- bool ready_mode,
MockInstallerState* installer_state) {
// Fresh install or upgrade?
const ProductState* cf =
@@ -387,11 +374,8 @@ class InstallWorkerTest : public testing::Test {
BrowserDistribution::GetSpecificDistribution(
BrowserDistribution::CHROME_FRAME);
scoped_ptr<Product> product(new Product(dist));
- if (installer_state->is_multi_install()) {
+ if (installer_state->is_multi_install())
product->SetOption(installer::kOptionMultiInstall, true);
- if (ready_mode)
- product->SetOption(installer::kOptionReadyMode, true);
- }
installer_state->AddProduct(&product);
}
}
@@ -420,7 +404,6 @@ class InstallWorkerTest : public testing::Test {
static MockInstallerState* BuildChromeFrameInstallerState(
bool system_install,
bool multi_install,
- bool ready_mode,
const InstallationState& machine_state,
InstallerState::Operation operation) {
// This method only works for installation/upgrade.
@@ -430,8 +413,7 @@ class InstallWorkerTest : public testing::Test {
operation));
if (multi_install)
AddChromeBinariesToInstallerState(machine_state, installer_state.get());
- AddChromeFrameToInstallerState(machine_state, ready_mode,
- installer_state.get());
+ AddChromeFrameToInstallerState(machine_state, installer_state.get());
return installer_state.release();
}
@@ -505,7 +487,7 @@ class OldIELowRightsTests : public InstallWorkerTest,
root_key_ = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
installation_state_.reset(new MockInstallationState());
- AddChromeFrameToInstallationState(system_level_, multi_install_, false,
+ AddChromeFrameToInstallationState(system_level_, multi_install_,
installation_state_.get());
installer_state_.reset(BuildBasicInstallerState(
system_level_, multi_install_, *installation_state_,
@@ -514,7 +496,7 @@ class OldIELowRightsTests : public InstallWorkerTest,
if (multi_install_)
AddChromeBinariesToInstallerState(*installation_state_,
installer_state_.get());
- AddChromeFrameToInstallerState(*installation_state_, false,
+ AddChromeFrameToInstallerState(*installation_state_,
installer_state_.get());
}
@@ -744,8 +726,7 @@ TEST_F(QuickEnableAbsentTest, CleanInstallSingleChrome) {
TEST_F(QuickEnableAbsentTest, CleanInstallSingleChromeFrame) {
// Install single Chrome Frame on a clean system.
scoped_ptr<MockInstallerState> installer_state(
- BuildChromeFrameInstallerState(system_level_, false, false,
- *machine_state_,
+ BuildChromeFrameInstallerState(system_level_, false, *machine_state_,
InstallerState::SINGLE_INSTALL_OR_UPDATE));
AddQuickEnableChromeFrameWorkItems(*installer_state,
*machine_state_,
@@ -757,8 +738,7 @@ TEST_F(QuickEnableAbsentTest, CleanInstallSingleChromeFrame) {
TEST_F(QuickEnableAbsentTest, CleanInstallMultiChromeFrame) {
// Install multi Chrome Frame on a clean system.
scoped_ptr<MockInstallerState> installer_state(
- BuildChromeFrameInstallerState(system_level_, true, false,
- *machine_state_,
+ BuildChromeFrameInstallerState(system_level_, true, *machine_state_,
InstallerState::MULTI_INSTALL));
AddQuickEnableChromeFrameWorkItems(*installer_state,
*machine_state_,
@@ -774,8 +754,7 @@ TEST_F(QuickEnableAbsentTest, CleanInstallMultiChromeChromeFrame) {
InstallerState::MULTI_INSTALL));
AddChromeBinariesToInstallerState(*machine_state_, installer_state.get());
AddChromeToInstallerState(*machine_state_, installer_state.get());
- AddChromeFrameToInstallerState(*machine_state_, false,
- installer_state.get());
+ AddChromeFrameToInstallerState(*machine_state_, installer_state.get());
AddQuickEnableChromeFrameWorkItems(*installer_state,
*machine_state_,
setup_path_,
@@ -785,10 +764,8 @@ TEST_F(QuickEnableAbsentTest, CleanInstallMultiChromeChromeFrame) {
TEST_F(QuickEnableAbsentTest, UninstallMultiChromeLeaveMultiChromeFrame) {
// Uninstall multi Chrome on a machine with multi Chrome Frame.
- AddChromeToInstallationState(system_level_, true, false,
- machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, true, false,
- machine_state_.get());
+ 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));
@@ -802,33 +779,12 @@ TEST_F(QuickEnableAbsentTest, UninstallMultiChromeLeaveMultiChromeFrame) {
TEST_F(QuickEnableAbsentTest, UninstallMultiChromeLeaveSingleChromeFrame) {
// Uninstall multi Chrome on a machine with single Chrome Frame.
- AddChromeToInstallationState(system_level_, true, false,
- machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, false, 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_F(QuickEnableAbsentTest, AcceptReadyMode) {
- // Accept ready-mode.
- AddChromeToInstallationState(system_level_, true, true,
- machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, true, true,
- machine_state_.get());
+ 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());
- AddChromeFrameToInstallerState(*machine_state_, false, installer_state.get());
AddChromeBinariesToInstallerState(*machine_state_, installer_state.get());
AddQuickEnableChromeFrameWorkItems(*installer_state,
*machine_state_,
@@ -902,32 +858,14 @@ TEST_F(QuickEnablePresentTest, CleanInstallMultiChrome) {
&work_item_list_);
}
-TEST_F(QuickEnablePresentTest, CleanInstallMultiChromeReadyMode) {
- // Install multi Chrome with Chrome Frame ready-mode 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_, true,
- installer_state.get());
- 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, false,
- machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, false, false,
- machine_state_.get());
+ 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_, false, installer_state.get());
+ AddChromeFrameToInstallerState(*machine_state_, installer_state.get());
AddQuickEnableChromeFrameWorkItems(*installer_state,
*machine_state_,
setup_path_,
@@ -937,14 +875,12 @@ TEST_F(QuickEnablePresentTest, UninstallSingleChromeFrame) {
TEST_F(QuickEnablePresentTest, UninstallMultiChromeFrame) {
// Uninstall multi Chrome Frame on a machine with multi Chrome.
- AddChromeToInstallationState(system_level_, true, false,
- machine_state_.get());
- AddChromeFrameToInstallationState(system_level_, true, false,
- machine_state_.get());
+ 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_, false, installer_state.get());
+ AddChromeFrameToInstallerState(*machine_state_, installer_state.get());
AddQuickEnableChromeFrameWorkItems(*installer_state,
*machine_state_,
setup_path_,
@@ -979,11 +915,11 @@ TEST_F(InstallWorkerTest, WillProductBePresentAfterSetup) {
scoped_ptr<MockInstallationState> machine_state(
new MockInstallationState());
if ((i_mach & (1 << TYPE_BROWSER)) != 0) { // Add Chrome.
- AddChromeToInstallationState(system_level, multi_install, false,
+ AddChromeToInstallationState(system_level, multi_install,
machine_state.get());
}
if ((i_mach & (1 << TYPE_CF)) != 0) { // Add Chrome Frame.
- AddChromeFrameToInstallationState(system_level, multi_install, false,
+ AddChromeFrameToInstallationState(system_level, multi_install,
machine_state.get());
}
@@ -1003,8 +939,7 @@ TEST_F(InstallWorkerTest, WillProductBePresentAfterSetup) {
continue;
installer_state.reset(BuildChromeFrameInstallerState(
- system_level, multi_install, false, *machine_state,
- op_list[i_op]));
+ system_level, multi_install, *machine_state, op_list[i_op]));
} else {
NOTREACHED();
}
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/setup_main.cc » ('j') | chrome/installer/util/installation_validator_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698