Remove Chrome Frame ready-mode.

chrome/installer/util/installation_validator_unittest.cc

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 16a2e2bfd60d133767a60dc85206cb90439b14c2..fffcf2bd8762e2e5cdb5348b50252f4a1e35e228 100644
--- a/chrome/installer/util/installation_validator_unittest.cc
+++ b/chrome/installer/util/installation_validator_unittest.cc
@@ -54,8 +54,7 @@ enum ChannelModifier {
   CM_MULTI        = 0x01,
   CM_CHROME       = 0x02,
   CM_CHROME_FRAME = 0x04,
-  CM_READY_MODE   = 0x08,
-  CM_FULL         = 0x10
+  CM_FULL         = 0x08

[robertshield, 2013/12/11 20:56:49]

is it necessary / a good idea to give CM_FULL a new value, could we leave it as
0x10, possibly renaming CM_READY_MODE to CM_DEPRECATED_DO_NOT_USE?

[grt (UTC plus 2), 2013/12/11 22:13:55]

To my knowledge these values aren't persisted. I think it will look more
confusing to have a gap or a meaningless value there. Perhaps I'm missing
something, though. Do you see a risk/problem here?

[robertshield, 2013/12/11 22:19:14]

Not a concrete one, just more of a general reaction to re-assigning enum values.
I originally misread this file as being not test code, if this value is never
persisted, all is well. Carry on :-)

 };
 
 const wchar_t* const kChromeChannels[] = {
@@ -144,7 +143,6 @@ const FakeProductState::ChannelMethodForModifier
   { CM_MULTI,        &ChannelInfo::SetMultiInstall },
   { CM_CHROME,       &ChannelInfo::SetChrome },
   { CM_CHROME_FRAME, &ChannelInfo::SetChromeFrame },
-  { CM_READY_MODE,   &ChannelInfo::SetReadyMode },
   { CM_FULL,         &ChannelInfo::SetFullSuffix }
 };
 
@@ -204,20 +202,10 @@ void FakeProductState::SetUninstallCommand(BrowserDistribution::Type dist_type,
     uninstall_command_.AppendSwitch(installer::switches::kSystemLevel);
   if (is_multi_install) {
     uninstall_command_.AppendSwitch(installer::switches::kMultiInstall);
-    if (dist_type == BrowserDistribution::CHROME_BROWSER) {
+    if (dist_type == BrowserDistribution::CHROME_BROWSER)
       uninstall_command_.AppendSwitch(installer::switches::kChrome);
-      if ((channel_modifiers & CM_READY_MODE) != 0) {
-        uninstall_command_.AppendSwitch(installer::switches::kChromeFrame);
-        uninstall_command_.AppendSwitch(
-            installer::switches::kChromeFrameReadyMode);
-      }
-    } else if (dist_type == BrowserDistribution::CHROME_FRAME) {
+    else if (dist_type == BrowserDistribution::CHROME_FRAME)
       uninstall_command_.AppendSwitch(installer::switches::kChromeFrame);
-      if ((channel_modifiers & CM_READY_MODE) != 0) {
-        uninstall_command_.AppendSwitch(
-            installer::switches::kChromeFrameReadyMode);
-      }
-    }
   } else if (dist_type == BrowserDistribution::CHROME_FRAME) {
     uninstall_command_.AppendSwitch(installer::switches::kChromeFrame);
   }
@@ -433,8 +421,6 @@ void InstallationValidatorTest::SetUpTestCase() {
   ttm[InstallationValidator::CHROME_FRAME_MULTI] = CM_MULTI | CM_CHROME_FRAME;
   ttm[InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI] =
       CM_MULTI | CM_CHROME_FRAME | CM_CHROME;
-  ttm[InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI] =
-      CM_MULTI | CM_CHROME_FRAME | CM_CHROME | CM_READY_MODE;
 }
 
 // static
@@ -484,7 +470,7 @@ void InstallationValidatorTest::set_validation_error_recipient(
 // static
 // Populates |state| with the state of a valid installation of product
 // |prod_type|.  |inst_type| dictates properties of the installation
-// (multi-install, ready-mode, etc).
+// (multi-install, etc).
 void InstallationValidatorTest::MakeProductState(
     BrowserDistribution::Type prod_type,
     InstallationValidator::InstallationType inst_type,
@@ -500,8 +486,7 @@ void InstallationValidatorTest::MakeProductState(
        (inst_type & InstallationValidator::ProductBits::CHROME_MULTI) != 0) ||
       (prod_type == BrowserDistribution::CHROME_FRAME &&
        (inst_type &
-           (InstallationValidator::ProductBits::CHROME_FRAME_MULTI |
-            InstallationValidator::ProductBits::CHROME_FRAME_READY_MODE)) != 0);
+           InstallationValidator::ProductBits::CHROME_FRAME_MULTI) != 0);
 
   const wchar_t* const* channels = &kChromeChannels[0];
   if (prod_type == BrowserDistribution::CHROME_FRAME && !is_multi_install)
@@ -516,9 +501,7 @@ 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 ||
-         inst_type ==
-             InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI) {
+    if (inst_type == InstallationValidator::CHROME_MULTI) {
       state->AddQuickEnableCfCommand(prod_type, install_level,
                                      chrome::kChromeVersion, channel_modifiers);
     }
@@ -560,12 +543,10 @@ void InstallationValidatorTest::MakeMachineState(
        InstallationValidator::ProductBits::CHROME_MULTI);
   static const int kChromeFrameMask =
       (InstallationValidator::ProductBits::CHROME_FRAME_SINGLE |
-       InstallationValidator::ProductBits::CHROME_FRAME_MULTI |
-       InstallationValidator::ProductBits::CHROME_FRAME_READY_MODE);
+       InstallationValidator::ProductBits::CHROME_FRAME_MULTI);
   static const int kBinariesMask =
       (InstallationValidator::ProductBits::CHROME_MULTI |
-       InstallationValidator::ProductBits::CHROME_FRAME_MULTI |
-       InstallationValidator::ProductBits::CHROME_FRAME_READY_MODE);
+       InstallationValidator::ProductBits::CHROME_FRAME_MULTI);
 
   FakeProductState prod_state;
 
@@ -622,5 +603,4 @@ INSTANTIATE_TEST_CASE_P(
            InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE,
            InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI,
            InstallationValidator::CHROME_FRAME_MULTI,
-           InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI,
-           InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI));
+           InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI));