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

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"
 
 // 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 {
     REGISTRY,
     VERSION_FOLDER
   };
 
   // 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();
 
   // This method will first install the full installer and
   // then over installs with diff installer. If |should_start_ie| is true,
   // start IE browser before launch installer, and leave the process running
   // through the installtions.
   void OverInstallOnFullInstaller(const std::wstring& install_type,
                                   bool should_start_ie);
 
@@ skipping 51 matching lines @@
 
   // Get HKEY based on install type.
   HKEY GetRootRegistryKey();
 
   // Returns Chrome pv registry key value.
   bool GetChromeVersionFromRegistry(std::wstring* reg_key_value);
 
   // 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();
 
   // 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,
                          const std::wstring& reg_key_value_after_overinstall);
 
   // This method will verify if the installed build is correct.
   bool VerifyStandaloneInstall();
 
   // Get all the latest installers base on last modified date.
   bool LocateInstallers(const std::wstring& build);
 
   // 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_;
 
   FilePath full_installer_;
   FilePath diff_installer_;
   FilePath previous_installer_;
   FilePath standalone_installer_;
+  FilePath mini_installer_;
 
   // Build numbers.
   std::wstring current_build_, previous_build_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeMiniInstaller);
 };
 
 #endif  // CHROME_TEST_MINI_INSTALLER_TEST_CHROME_MINI_INSTALLER_H_