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

chrome/test/mini_installer_test/chrome_mini_installer.h

Index: chrome/test/mini_installer_test/chrome_mini_installer.h
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.h b/chrome/test/mini_installer_test/chrome_mini_installer.h
index 6808f381f1cea437f12ac3aa087139804220e84b..eebfa7577ed0306c6ae27eeb92dc61e8c4ddeb6a 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.h
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.h
@@ -16,7 +16,7 @@
 // This class has methods to install and uninstall Chrome mini installer.
 class ChromeMiniInstaller {
  public:
-  ChromeMiniInstaller(const std::wstring& install_type, bool is_chrome_frame);
+  ChromeMiniInstaller(bool system_install, bool is_chrome_frame);
   ~ChromeMiniInstaller() {}
 
   enum RepairChrome {
@@ -26,11 +26,13 @@ class ChromeMiniInstaller {
 
   // This method returns path to either program files
   // or documents and setting based on the install type.
-  std::wstring GetChromeInstallDirectoryLocation();
+  bool GetChromeInstallDirectoryLocation(FilePath* path);
 
   // Installs the latest full installer.
   void InstallFullInstaller(bool over_install);
 
+  void InstallUsingMultiInstall();
+
   // Installs chrome.
   void Install();
 
@@ -102,25 +104,15 @@ class ChromeMiniInstaller {
   // This method gets the shortcut path from start menu based on install type.
   FilePath GetStartMenuShortcutPath();
 
-  // Get path for uninstall.
-  std::wstring GetUninstallPath();
-
   // Get user data directory path.
   FilePath GetUserDataDirPath();
 
-  // Gets the path to launch Chrome.
-  bool GetChromeLaunchPath(FilePath* launch_path);
-
-  // This method will get Chrome.exe path and launch it.
-  void VerifyChromeLaunch(bool expected_status);
+  // Launch Chrome. Kill process if |kill| is true.
+  void LaunchChrome(bool kill);
 
   // This method verifies if Chrome/Chrome Frame installed correctly.
   void VerifyInstall(bool over_install);
 
-  // This method verifies installation of Chrome/Chrome Frame via machine
-  // introspection.
-  void VerifyMachineState();
-
   // This method will verify if ChromeFrame got successfully installed on the
   // machine.
   void VerifyChromeFrameInstall();
@@ -128,17 +120,8 @@ class ChromeMiniInstaller {
   // Launch IE with |navigate_url|.
   void LaunchIE(const std::wstring& navigate_url);
 
-  // Launches the chrome installer and waits for it to end.
-  void LaunchInstaller(const FilePath& path,
-                       const wchar_t* process_name);
-
-  // Verifies if Chrome launches after install.
-  void LaunchAndCloseChrome(bool over_install);
-
-  // Launches any requested browser.
-  void LaunchBrowser(const FilePath& path,
-                     const std::wstring& args,
-                     bool expected_status);
+  // Launch installer using provided |command|.

[kkania, 2011/09/28 18:02:43]

Ideally this should be changed to RunInstaller, since it doesn't just launch the
process, it waits for it to run, right? If you don't want to change the name,
just mention it in the comment.

[Huyen, 2011/09/28 18:55:48]

Done.

+  void LaunchInstaller(const CommandLine& command);
 
   // Compares the registry key values after overinstall.
   bool VerifyOverInstall(const std::wstring& reg_key_value_before_overinstall,
@@ -153,9 +136,8 @@ class ChromeMiniInstaller {
   // This method will create a command line to run apply tag.
   CommandLine GetCommandForTagging();
 
-  // This variable holds the install type.
-  // Install type can be either system or user level.
-  std::wstring install_type_;
+  // If true install system level. Otherwise install user level.
+  bool system_install_;
 
   bool is_chrome_frame_;
 
@@ -163,6 +145,7 @@ class ChromeMiniInstaller {
   FilePath diff_installer_;
   FilePath previous_installer_;
   FilePath standalone_installer_;
+  FilePath mini_installer_;
 
   // Build numbers.
   std::wstring current_build_, previous_build_;