Get rid of FromWStringHack in chrome_mini_installer.cc.

chrome/test/mini_installer_test/chrome_mini_installer.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/string_util.h"
 
 class FilePath;
 
 // This class has methods to install and uninstall Chrome mini installer.
 class ChromeMiniInstaller {
  public:
   explicit ChromeMiniInstaller(const std::wstring& install_type,
                                bool is_chrome_frame);
 
   ~ChromeMiniInstaller() {}
@@ skipping 32 matching lines @@
 
   // Uninstalls Chrome.
   void UnInstall();
 
   // This method will perform a over install
   void OverInstall();
 
   void SetBuildUnderTest(const std::wstring& build);
 
  private:
-  // This variable holds the install type.
-  // Install type can be either system or user level.
-  std::wstring install_type_;
-
-  bool standalone_installer;
-
-  bool is_chrome_frame_;
-
-  // Name of the browser (Chrome or Chromium) and install type (sys or user)
-  std::wstring installer_name_;
-
-  // The full path to the various installers.
-  std::wstring full_installer_, diff_installer_, prev_installer_;
-
-  // Whether the path to the associated installer could be found.
-  // This is because we do not want to assert that these paths exist
-  // except in the tests that use them.
-  bool has_full_installer_, has_diff_installer_, has_prev_installer_;
-
-  // The version string of the current and previous builds.
-  std::wstring curr_version_, prev_version_;
-
   // Will clean up the machine if Chrome install is messed up.
   void CleanChromeInstall();
 
   // Closes Chrome uninstall confirm dialog window.
   bool CloseUninstallWindow();
 
   // Closes Chrome browser.
   bool CloseChromeBrowser();
 
   // Checks for registry key.
@@ skipping 10 matching lines @@
 
   // This will delete pv key from client registry.
   void DeletePvRegistryKey();
 
   // This method verifies Chrome shortcut.
   void FindChromeShortcut();
 
   // Get HKEY based on install type.
   HKEY GetRootRegistryKey();
 
-  // Returns Chrome pv registry key value
-  bool GetChromeVersionFromRegistry(std::wstring *return_reg_key_value);
+  // 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.
-  std::wstring GetStartMenuShortcutPath();
+  FilePath GetStartMenuShortcutPath();
 
   // Get path for uninstall.
   std::wstring GetUninstallPath();
 
   // Get user data directory path.
   FilePath GetUserDataDirPath();
 
   // Gets the path to launch Chrome.
   bool GetChromeLaunchPath(std::wstring* launch_path);
 
   // This method will get Chrome.exe path and launch it.
   void VerifyChromeLaunch(bool expected_status);
 
   // 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.
+  // This method will verify if ChromeFrame got successfully installed on the
+  // machine.
   void VerifyChromeFrameInstall();
 
   // Launches the chrome installer and waits for it to end.
   void LaunchInstaller(const std::wstring& install_path,
                        const wchar_t* process_name);
 
   // Verifies if Chrome launches after install.
   void LaunchAndCloseChrome(bool over_install);
 
   // Launches any requested browser.
   void LaunchBrowser(const std::wstring& launch_path,
                      const std::wstring& launch_arg,
                      const std::wstring& process_name,
                      bool expected_status);
 
   // 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();
 
+  // This variable holds the install type.
+  // Install type can be either system or user level.
+  std::wstring install_type_;
+
+  bool is_chrome_frame_;
+
+  // Name of the browser (Chrome or Chromium) and install type (sys or user)
+  std::wstring installer_name_;
+
+  // The full path to the various installers.
+  std::wstring full_installer_, diff_installer_, prev_installer_;
+
+  // Whether the path to the associated installer could be found.
+  // This is because we do not want to assert that these paths exist
+  // except in the tests that use them.
+  bool has_full_installer_, has_diff_installer_, has_prev_installer_;
+
+  // The version string of the current and previous builds.
+  std::wstring curr_version_, prev_version_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeMiniInstaller);
 };
 
 #endif  // CHROME_TEST_MINI_INSTALLER_TEST_CHROME_MINI_INSTALLER_H_
-