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

chrome/test/mini_installer_test/test.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/test/mini_installer_test/chrome_mini_installer.h"
 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
 #include "chrome/test/mini_installer_test/mini_installer_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 // Although the C++ style guide disallows use of namespace directive, use
 // here because this is not only a .cc file, but also a test.
 using namespace mini_installer_constants;  // NOLINT
 
 namespace {
 
 class MiniInstallTest : public testing::Test {
  public:
   MiniInstallTest() : chrome_frame_(false) {}
 
   static void CleanTheSystem() {
     const CommandLine* cmd = CommandLine::ForCurrentProcess();
     if (cmd->HasSwitch(installer::switches::kChromeFrame)) {
-      ChromeMiniInstaller systeminstall(kSystemInstall,
-          cmd->HasSwitch(installer::switches::kChromeFrame));
-      systeminstall.UnInstall();
+      ChromeMiniInstaller(true, true).UnInstall();
     } else {
-      ChromeMiniInstaller userinstall(kUserInstall,
-          cmd->HasSwitch(installer::switches::kChromeFrame));
-      userinstall.UnInstall();
-      ChromeMiniInstaller systeminstall(kSystemInstall,
-          cmd->HasSwitch(installer::switches::kChromeFrame));
-      systeminstall.UnInstall();
+      ChromeMiniInstaller(false, false).UnInstall();
+      ChromeMiniInstaller(true, false).UnInstall();
     }
   }
 
   virtual void SetUp() {
     // Parse test command-line arguments.
     const CommandLine* cmd = CommandLine::ForCurrentProcess();
     std::wstring build =
         cmd->GetSwitchValueNative(switches::kInstallerTestBuild);
     chrome_frame_ = cmd->HasSwitch(installer::switches::kChromeFrame);
 
     CleanTheSystem();
     // Separate the test output from cleaning output
     printf("\nBEGIN test----------------------------------------\n");
 
     // Create a few differently configured installers that are used in
     // the tests, for convenience.
-    user_inst_.reset(new ChromeMiniInstaller(kUserInstall,
-                                             chrome_frame_));
-    sys_inst_.reset(new ChromeMiniInstaller(kSystemInstall,
-                                            chrome_frame_));
+    user_inst_.reset(new ChromeMiniInstaller(false, chrome_frame_));
+    sys_inst_.reset(new ChromeMiniInstaller(true, chrome_frame_));
     sys_inst_->SetBuildUnderTest(build);
     user_inst_->SetBuildUnderTest(build);
   }
 
   static void TearDownTestCase() {
     // Uninstall Chrome from the system after tests are run.
     CleanTheSystem();
   }
 
  protected:
@@ skipping 98 matching lines @@
   if (!chrome_frame_)
     user_inst_->OverInstall();
 }
 
 // Encountering issue 9593. Disabling temporarily.
 TEST_F(MiniInstallTest,
        DISABLED_InstallLatestDevFullInstallerOverChromeMetaInstallerTest) {
   if (!chrome_frame_)
     user_inst_->OverInstall();
 }
+
+TEST_F(MiniInstallTest,
+    InstallChromeUsingMultiInstallUser) {
+  user_inst_->InstallUsingMultiInstall();
+}
+
+TEST_F(MiniInstallTest,
+    InstallChromeUsingMultiInstallSys) {
+  sys_inst_->InstallUsingMultiInstall();
+}
 #endif
 
 TEST_F(MiniInstallTest, InstallMiniInstallerSys) {
   sys_inst_->Install();
 }
 
 #if defined(OS_WIN)
 // http://crbug.com/57157 - Fails on windows.
 #define MAYBE_InstallMiniInstallerUser FLAKY_InstallMiniInstallerUser
 #else
 #define MAYBE_InstallMiniInstallerUser InstallMiniInstallerUser
 #endif
 TEST_F(MiniInstallTest, MAYBE_InstallMiniInstallerUser) {
   user_inst_->Install();
 }
 
 TEST_F(MiniInstallTest, MiniInstallTestValidWindowsVersion) {
   // We run the tests on all supported OSes.
   // Make sure the code agrees.
   EXPECT_TRUE(InstallUtil::IsOSSupported());
 }