Add test for Chrome install with existing Chrome Frame Multi-install

chrome/test/mini_installer_test/chrome_mini_installer.h

 // 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.
 
 #ifndef CHROME_TEST_MINI_INSTALLER_TEST_CHROME_MINI_INSTALLER_H_
 #define CHROME_TEST_MINI_INSTALLER_TEST_CHROME_MINI_INSTALLER_H_
 #pragma once
 
 #include <windows.h>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/command_line.h"
 #include "chrome/installer/util/browser_distribution.h"
 
 // This class has methods to install and uninstall Chrome mini installer.
 class ChromeMiniInstaller {
  public:
   ChromeMiniInstaller(bool system_install,
       bool is_chrome_frame, const std::string& build);
   ~ChromeMiniInstaller() {}
 
   enum RepairChrome {
     REGISTRY,
     VERSION_FOLDER
   };
 
-  // This method returns path to either program files
-  // or documents and setting based on the install type.
-  bool GetChromeInstallDirectoryLocation(FilePath* path);
+  // Get the location at which Chrome or Chrome Frame is installed.
+  bool GetInstallDirectory(FilePath* path);
+
   // Get the base multi-install command.
   CommandLine GetBaseMultiInstallCommand();
 
   // Installs the latest full installer.
   void InstallFullInstaller(bool over_install);
 
   void InstallChromeUsingMultiInstall();
   void InstallChromeFrameUsingMultiInstall();
   void InstallChromeAndChromeFrame(bool ready_mode);
 
@@ skipping 73 matching lines @@
   // This method verifies if Chrome/Chrome Frame installed correctly.
   void VerifyInstall(bool over_install);
 
   // This method will verify if ChromeFrame got successfully installed on the
   // machine.
   void VerifyChromeFrameInstall();
 
   // Launch IE with |navigate_url|.
   void LaunchIE(const std::wstring& navigate_url);
 
-  // Run installer using provided |command|.
-  void RunInstaller(const CommandLine& command);
+  // Run the given |command|.

[kkania, 2011/10/31 17:43:38]

I think RunInstaller was a more helpful name. It would be nice to include that
it appends system level switch.

+  void RunCommand(const CommandLine& command);
 
   // Compares the registry key values after overinstall.
   bool VerifyOverInstall(const std::string& reg_key_value_before_overinstall,
                          const std::string& reg_key_value_after_overinstall);
 
   // This method will verify if the installed build is correct.
   bool VerifyStandaloneInstall();
 
   // This method will create a command line to run apply tag.
   CommandLine GetCommandForTagging();
@@ skipping 15 matching lines @@
 
   // Build under test.
   std::string build_;
   // Build numbers.
   std::string current_build_, current_diff_build_, previous_build_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeMiniInstaller);
 };
 
 #endif  // CHROME_TEST_MINI_INSTALLER_TEST_CHROME_MINI_INSTALLER_H_