Add test for installing Chrome Frame using multi-install

chrome/test/mini_installer_test/chrome_mini_installer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/mini_installer_test/chrome_mini_installer.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 178 matching lines @@
       << "Install failed: unable to get version.";
   VerifyInstall(over_install);
 }
 
 CommandLine ChromeMiniInstaller::GetBaseMultiInstallCommand() {
   FilePath mini_installer;
   if (!GetMiniInstaller(&mini_installer))
     return CommandLine(CommandLine::NO_PROGRAM);
   CommandLine cmd(mini_installer);
   cmd.AppendSwitch(installer::switches::kMultiInstall);
-  cmd.AppendSwitch(installer::switches::kDoNotLaunchChrome);
   return cmd;
 }
 
 void ChromeMiniInstaller::InstallChromeUsingMultiInstall() {
   CommandLine cmd = GetBaseMultiInstallCommand();
   cmd.AppendSwitch(installer::switches::kChrome);
   RunInstaller(cmd);
 
   // Verify installation.
   InstallationValidator::InstallationType type =
       installer::ExpectValidInstallation(system_install_);
   BrowserDistribution* dist = GetCurrentBrowserDistribution();
   ASSERT_TRUE(InstallUtil::IsMultiInstall(dist, system_install_));
   EXPECT_TRUE(type & InstallationValidator::ProductBits::CHROME_MULTI);
   FindChromeShortcut();
   LaunchChrome(true);
 }
 
 void ChromeMiniInstaller::InstallChromeFrameUsingMultiInstall() {
   CommandLine cmd = GetBaseMultiInstallCommand();
-  cmd.AppendSwitch(installer::switches::kChromeFrame);
   RunInstaller(cmd);
 
   // Verify installation.
   InstallationValidator::InstallationType type =
       installer::ExpectValidInstallation(system_install_);
   BrowserDistribution* dist = GetCurrentBrowserDistribution();
   ASSERT_TRUE(InstallUtil::IsMultiInstall(dist, system_install_));
   EXPECT_TRUE(type & InstallationValidator::ProductBits::CHROME_FRAME_MULTI);
   // Launch IE
   LaunchIE(L"gcf:about:version");
-  // Check if Chrome process got spawned.
-  MiniInstallerTestUtil::VerifyProcessLaunch(installer::kChromeExe, false);
+  if (system_install_) {
+    MiniInstallerTestUtil::VerifyProcessLaunch(installer::kChromeExe, true);
+  } else {
+    MiniInstallerTestUtil::VerifyProcessLaunch(
+        installer::kChromeFrameHelperExe, true);
+  }
   FindChromeShortcut();
 }
 
 void ChromeMiniInstaller::InstallChromeAndChromeFrame(bool ready_mode) {
   CommandLine cmd = GetBaseMultiInstallCommand();
   cmd.AppendSwitch(installer::switches::kChrome);
   cmd.AppendSwitch(installer::switches::kChromeFrame);
   if (ready_mode)
     cmd.AppendSwitch(installer::switches::kChromeFrameReadyMode);
   RunInstaller(cmd);
@@ skipping 657 matching lines @@
   }
 
   if (installer.empty()) {
     LOG(WARNING) << "Failed to find installer with pattern: " << pattern;
     return false;
   }
 
   *path = installer;
   return true;
 }