Index: chrome/installer/test/alternate_version_generator.h |
diff --git a/chrome/installer/test/alternate_version_generator.h b/chrome/installer/test/alternate_version_generator.h |
index b75b381fa23a0169b971bc26be87e798be411b52..c887c307c27640becd30f6b4b58f7d90c036e63b 100644 |
--- a/chrome/installer/test/alternate_version_generator.h |
+++ b/chrome/installer/test/alternate_version_generator.h |
@@ -7,7 +7,7 @@ |
#ifndef CHROME_INSTALLER_TEST_ALTERNATE_VERSION_GENERATOR_H_ |
#define CHROME_INSTALLER_TEST_ALTERNATE_VERSION_GENERATOR_H_ |
-#include <string> |
+#include "base/strings/string16.h" |
namespace base { |
class FilePath; |
@@ -30,16 +30,18 @@ enum Direction { |
bool GenerateAlternateVersion(const base::FilePath& original_installer_path, |
const base::FilePath& target_path, |
Direction direction, |
- std::wstring* original_version, |
- std::wstring* new_version); |
+ base::string16* original_version, |
+ base::string16* new_version); |
// Given a path to a PEImage in |original_file|, copy that file to |
// |target_file|, modifying the version of the copy according to |direction|. |
-// Any previous file at |target_file| is clobbered. Returns true on success. |
-// Note that |target_file| may still be mutated on failure. |
-bool GenerateAlternatePEFileVersion(const base::FilePath& original_file, |
- const base::FilePath& target_file, |
- Direction direction); |
+// Any previous file at |target_file| is clobbered. On success, returns the |
+// version of the generated file. Otherwise, returns an empty string. Note that |
+// |target_file| may still be mutated on failure. |
+base::string16 GenerateAlternatePEFileVersion( |
+ const base::FilePath& original_file, |
+ const base::FilePath& target_file, |
+ Direction direction); |
// Given a path to a PEImage in |original_file|, copy that file to |
// |target_file|, modifying the version of the copy according to |version|. |