Add tests for Chrome over install when in use.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/8372039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108314 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 25 insertions, 10 deletions

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index 767e038..79d20a3 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -212,8 +212,8 @@ void ChromeMiniInstaller::InstallChromeUsingMultiInstall() {
   RunInstaller(cmd);
 
   // Verify installation.
-  InstallationValidator::InstallationType type =
-      installer::ExpectValidInstallation(system_install_);
+  InstallationValidator::InstallationType type;
+  InstallationValidator::ValidateInstallationType(system_install_, &type);
   BrowserDistribution* dist = GetCurrentBrowserDistribution();
   ASSERT_TRUE(InstallUtil::IsMultiInstall(dist, system_install_));
   EXPECT_TRUE(type & InstallationValidator::ProductBits::CHROME_MULTI);
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.h b/chrome/test/mini_installer_test/chrome_mini_installer.h
index 7ecf4a0..a0b3d65a 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.h
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.h
@@ -71,6 +71,10 @@ class ChromeMiniInstaller {
   // This method will perform a over install
   void OverInstall();
 
+  // Launch Chrome, assert process started.
+  // If |kill|, kill process after launch.
+  void LaunchChrome(bool kill);
+
  private:
   // Will clean up the machine if Chrome install is messed up.
   void CleanChromeInstall();
@@ -108,10 +112,6 @@ class ChromeMiniInstaller {
   // Get user data directory path.
   FilePath GetUserDataDirPath();
 
-  // Launch Chrome, assert process started.
-  // If |kill|, kill process after launch.
-  void LaunchChrome(bool kill);
-
   // This method verifies if Chrome/Chrome Frame installed correctly.
   void VerifyInstall(bool over_install);
 
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index 7f00a70..7a5c6e1 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -140,7 +140,7 @@ TEST_F(MiniInstallTest,
 
 TEST_F(MiniInstallTest,
     InstallChromeUsingMultiInstallSys) {
-  chrome_user_installer_->InstallChromeUsingMultiInstall();
+  chrome_sys_installer_->InstallChromeUsingMultiInstall();
 }
 
 TEST_F(MiniInstallTest, InstallChromeAndChromeFrameUser) {
@@ -169,19 +169,34 @@ TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallSys) {
   cf_sys_installer_->InstallChromeFrameUsingMultiInstall();
 }
 
-TEST_F(MiniInstallTest, InstallChromeWithExistingChromeFrameUser) {
+// Chrome Frame is in use while Chrome is install.
+TEST_F(MiniInstallTest, InstallChromeWithExistingChromeFrameMultiInstallUser) {
   cf_user_installer_->InstallChromeFrameUsingMultiInstall();
   chrome_user_installer_->InstallChromeUsingMultiInstall();
 }
 
-TEST_F(MiniInstallTest, InstallChromeWithExistingChromeFrameSys) {
+// Chrome Frame is in use while Chrome is install.
+TEST_F(MiniInstallTest, InstallChromeWithExistingChromeFrameMultiInstallSys) {
   cf_sys_installer_->InstallChromeFrameUsingMultiInstall();
   chrome_sys_installer_->InstallChromeUsingMultiInstall();
 }
+
+TEST_F(MiniInstallTest, OverInstallChromeWhenInUseUser) {
+  chrome_user_installer_->InstallChromeUsingMultiInstall();
+  chrome_user_installer_->LaunchChrome(false);
+  chrome_user_installer_->InstallChromeUsingMultiInstall();
+}
+
+TEST_F(MiniInstallTest, OverInstallChromeWhenInUseSys) {
+  chrome_sys_installer_->InstallChromeUsingMultiInstall();
+  chrome_sys_installer_->LaunchChrome(false);
+  chrome_sys_installer_->InstallChromeUsingMultiInstall();
+}
+
 #endif
 
 TEST_F(MiniInstallTest, InstallMiniInstallerSys) {
-  chrome_user_installer_->Install();
+  chrome_sys_installer_->Install();
 }
 
 #if defined(OS_WIN)