3 files changed, 18 insertions, 7 deletions
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index 0a14457..c6fea56 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -233,11 +233,12 @@ void ChromeMiniInstaller::InstallChromeFrameUsingMultiInstall() {
   FindChromeShortcut();
 }
 
-void ChromeMiniInstaller::InstallChromeAndChromeFrameReadyMode() {
+void ChromeMiniInstaller::InstallChromeAndChromeFrame(bool ready_mode) {
   CommandLine cmd = GetBaseMultiInstallCommand();
   cmd.AppendSwitch(installer::switches::kChrome);
   cmd.AppendSwitch(installer::switches::kChromeFrame);
-  cmd.AppendSwitch(installer::switches::kChromeFrameReadyMode);
+  if (ready_mode)
+    cmd.AppendSwitch(installer::switches::kChromeFrameReadyMode);
   RunInstaller(cmd);
   // Verify installation.
   InstallationValidator::InstallationType type =
@@ -245,8 +246,10 @@ void ChromeMiniInstaller::InstallChromeAndChromeFrameReadyMode() {
   BrowserDistribution* dist = GetCurrentBrowserDistribution();
   ASSERT_TRUE(InstallUtil::IsMultiInstall(dist, system_install_));
   EXPECT_TRUE(type & InstallationValidator::ProductBits::CHROME_MULTI);
-  EXPECT_TRUE(type &
-      InstallationValidator::ProductBits::CHROME_FRAME_READY_MODE);
+  if (ready_mode) {
+    EXPECT_TRUE(type &
+        InstallationValidator::ProductBits::CHROME_FRAME_READY_MODE);
+  }
   FindChromeShortcut();
   LaunchChrome(true);
   LaunchIE(L"gcf:about:version");
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.h b/chrome/test/mini_installer_test/chrome_mini_installer.h
index 4e624e2..550eb41 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.h
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.h
@@ -37,7 +37,7 @@ class ChromeMiniInstaller {
 
   void InstallChromeUsingMultiInstall();
   void InstallChromeFrameUsingMultiInstall();
-  void InstallChromeAndChromeFrameReadyMode();
+  void InstallChromeAndChromeFrame(bool ready_mode);
 
   // Installs chrome.
   void Install();
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index 628422c..366a99d 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -143,14 +143,22 @@ TEST_F(MiniInstallTest,
   chrome_user_installer_->InstallChromeUsingMultiInstall();
 }
 
+TEST_F(MiniInstallTest, InstallChromeAndChromeFrameUser) {
+  chrome_user_installer_->InstallChromeAndChromeFrame(false);
+}
+
+TEST_F(MiniInstallTest, InstallChromeAndChromeFrameSys) {
+  chrome_sys_installer_->InstallChromeAndChromeFrame(false);
+}
+
 TEST_F(MiniInstallTest,
     InstallChromeAndChromeFrameReadyModeUser) {
-  chrome_user_installer_->InstallChromeAndChromeFrameReadyMode();
+  chrome_user_installer_->InstallChromeAndChromeFrame(true);
 }
 
 TEST_F(MiniInstallTest,
     InstallChromeAndChromeFrameReadyModeSys) {
-  chrome_sys_installer_->InstallChromeAndChromeFrameReadyMode();
+  chrome_sys_installer_->InstallChromeAndChromeFrame(true);
 }
 
 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallUser) {