Adding simple Chrome install testing using multi-install and cleaning up a bit.

chrome/test/mini_installer_test/test.cc

Index: chrome/test/mini_installer_test/test.cc
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index b5b2a2a1e6c7dbe847c45845e227e7a6d65fcc33..2d0b9732445c31e76b272095ea2de42ad176a173 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -27,14 +27,14 @@ class MiniInstallTest : public testing::Test {
   static void CleanTheSystem() {
     const CommandLine* cmd = CommandLine::ForCurrentProcess();
     if (cmd->HasSwitch(installer::switches::kChromeFrame)) {
-      ChromeMiniInstaller systeminstall(kSystemInstall,
+      ChromeMiniInstaller systeminstall(true,
           cmd->HasSwitch(installer::switches::kChromeFrame));
       systeminstall.UnInstall();
     } else {
-      ChromeMiniInstaller userinstall(kUserInstall,
+      ChromeMiniInstaller userinstall(false,
           cmd->HasSwitch(installer::switches::kChromeFrame));

[kkania, 2011/09/26 20:00:53]

can't you replace this with false? same below?

[Huyen, 2011/09/27 23:00:24]

Done.

       userinstall.UnInstall();
-      ChromeMiniInstaller systeminstall(kSystemInstall,
+      ChromeMiniInstaller systeminstall(true,
           cmd->HasSwitch(installer::switches::kChromeFrame));
       systeminstall.UnInstall();
     }
@@ -53,9 +53,9 @@ class MiniInstallTest : public testing::Test {
 
     // Create a few differently configured installers that are used in
     // the tests, for convenience.
-    user_inst_.reset(new ChromeMiniInstaller(kUserInstall,
+    user_inst_.reset(new ChromeMiniInstaller(false,

[kkania, 2011/09/26 20:00:53]

collapse on one line; same below

[Huyen, 2011/09/27 23:00:24]

Done.

                                              chrome_frame_));
-    sys_inst_.reset(new ChromeMiniInstaller(kSystemInstall,
+    sys_inst_.reset(new ChromeMiniInstaller(true,
                                             chrome_frame_));
     sys_inst_->SetBuildUnderTest(build);
     user_inst_->SetBuildUnderTest(build);
@@ -175,6 +175,16 @@ TEST_F(MiniInstallTest,
   if (!chrome_frame_)
     user_inst_->OverInstall();
 }
+
+TEST_F(MiniInstallTest,
+    InstallChromeUsingMultiInstallUser) {
+  user_inst_->InstallUsingMultiInstall();

[kkania, 2011/09/26 20:00:53]

do these work when you do --chrome-frame too?

[Huyen, 2011/09/27 23:00:24]

I haven't try this scenario yet but it is a test that will be added.

+}
+
+TEST_F(MiniInstallTest,
+    InstallChromeUsingMultiInstallSys) {
+  sys_inst_->InstallUsingMultiInstall();
+}
 #endif
 
 TEST_F(MiniInstallTest, InstallMiniInstallerSys) {