Return version of the generated file in GenerateAlternatePEFileVersion.

chrome/installer/test/alternate_version_generator.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.
 //
 // This file exposes the public interface to the mini_installer re-versioner.
 
 #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;
 class Version;
 }
 
 namespace upgrade_test {
 
 enum Direction {
   PREVIOUS_VERSION,
   NEXT_VERSION
 };
 
 // Generates an alternate mini_installer.exe using the one indicated by
 // |original_installer_path|, giving the new one a lower or higher version than
 // the original and placing it in |target_path|.  Any previous file at
 // |target_path| is clobbered.  Returns true on success.  |original_version| and
 // |new_version|, when non-NULL, are given the original and new version numbers
 // on success.
 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|.
 // Any previous file at |target_file| is clobbered. Returns true on success.
 // Note that |target_file| may still be mutated on failure.
 bool GenerateSpecificPEFileVersion(const base::FilePath& original_file,
                                    const base::FilePath& target_file,
                                    const base::Version& version);
 
 }  // namespace upgrade_test
 
 #endif  // CHROME_INSTALLER_TEST_ALTERNATE_VERSION_GENERATOR_H_