installer: clean up to use FilePath instead of std::wstring.

BUG=24672
TEST=installer_util_unittests and setup_unittests

Review URL: http://codereview.chromium.org/385129
Patch from Thiago Farina <thiago.farina@gmail.com>.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32811 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 5 deletions

diff --git a/chrome/installer/setup/install.h b/chrome/installer/setup/install.h
index 305819a..8810803 100644
--- a/chrome/installer/setup/install.h
+++ b/chrome/installer/setup/install.h
@@ -12,11 +12,13 @@
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/version.h"
 
+class FilePath;
+
 namespace installer {
 // Get path to the installer under Chrome version folder
 // (for example <path>\Google\Chrome\<Version>\installer)
-std::wstring GetInstallerPathUnderChrome(const std::wstring& install_path,
-                                         const std::wstring& new_version);
+FilePath GetInstallerPathUnderChrome(const FilePath& install_path,
+                                     const std::wstring& new_version);
 
 // This function installs or updates a new version of Chrome. It returns
 // install status (failed, new_install, updated etc).
@@ -36,9 +38,12 @@ std::wstring GetInstallerPathUnderChrome(const std::wstring& install_path,
 // Note: since caller unpacks Chrome to install_temp_path\source, the caller
 // is responsible for cleaning up install_temp_path.
 installer_util::InstallStatus InstallOrUpdateChrome(
-    const std::wstring& exe_path, const std::wstring& archive_path,
-    const std::wstring& install_temp_path, const std::wstring& prefs_path,
-    const DictionaryValue* prefs, const Version& new_version,
+    const FilePath& exe_path,
+    const FilePath& archive_path,
+    const FilePath& install_temp_path,
+    const FilePath& prefs_path,
+    const DictionaryValue* prefs,
+    const Version& new_version,
     const Version* installed_version);
 }