base/version: remove wstring version

And fix callers.

BUG=23581
TEST=trybots

Review URL: http://codereview.chromium.org/5848005

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

6 files changed, 14 insertions, 10 deletions

diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index 34eed36..d982792 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -8,6 +8,7 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/util_constants.h"
 #include "courgette/courgette.h"
@@ -45,7 +46,7 @@ Version* installer::GetVersionFromArchiveDir(const FilePath& chrome_path) {
     file_util::FileEnumerator::FindInfo find_data = {0};
     version_enum.GetFindInfo(&find_data);
     VLOG(1) << "directory found: " << find_data.cFileName;
-    version = Version::GetVersionFromString(find_data.cFileName);
+    version = Version::GetVersionFromString(WideToASCII(find_data.cFileName));
     if (version)
       break;
   }
diff --git a/chrome/installer/util/helper_unittest.cc b/chrome/installer/util/helper_unittest.cc
index ee92ba56..48b2476 100644
--- a/chrome/installer/util/helper_unittest.cc
+++ b/chrome/installer/util/helper_unittest.cc
@@ -109,7 +109,7 @@ TEST_F(SetupHelperTest, Delete) {
   CreateTextFile(chrome_dll_4.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(chrome_dll_4));
 
-  scoped_ptr<Version> latest_version(Version::GetVersionFromString(L"1.0.4.0"));
+  scoped_ptr<Version> latest_version(Version::GetVersionFromString("1.0.4.0"));
   ChromePackageProperties properties;
   scoped_refptr<Package> package(new Package(false, true, chrome_dir,
                                              &properties));
@@ -185,7 +185,7 @@ TEST_F(SetupHelperTest, DeleteInUsed) {
   CreateTextFile(chrome_dll_4.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(chrome_dll_4));
 
-  scoped_ptr<Version> latest_version(Version::GetVersionFromString(L"1.0.4.0"));
+  scoped_ptr<Version> latest_version(Version::GetVersionFromString("1.0.4.0"));
   ChromePackageProperties properties;
   scoped_refptr<Package> install_path(new Package(false, true, chrome_dir,
                                                   &properties));
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index 9ba1cec..2592429 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -95,7 +95,7 @@ Version* InstallUtil::GetChromeVersion(BrowserDistribution* dist,
   key.Close();
   VLOG(1) << "Existing " << dist->GetApplicationName()
           << " version found " << version_str;
-  return Version::GetVersionFromString(version_str);
+  return Version::GetVersionFromString(WideToASCII(version_str));
 }
 
 bool InstallUtil::IsOSSupported() {
diff --git a/chrome/installer/util/package.cc b/chrome/installer/util/package.cc
index 72c819c..6e88a30 100644
--- a/chrome/installer/util/package.cc
+++ b/chrome/installer/util/package.cc
@@ -6,6 +6,7 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/channel_info.h"
@@ -125,7 +126,8 @@ Version* Package::GetCurrentVersion() const {
       chrome_key.ReadValue(google_update::kRegVersionField, &version);
 
     if (!version.empty()) {
-      scoped_ptr<Version> this_version(Version::GetVersionFromString(version));
+      scoped_ptr<Version> this_version(Version::GetVersionFromString(
+                                           WideToASCII(version)));
       if (this_version.get()) {
         if (!current_version.get() ||
             (current_version->CompareTo(*this_version) > 0)) {
@@ -155,7 +157,8 @@ void Package::RemoveOldVersionDirectories(
     file_util::FileEnumerator::FindInfo find_data = {0};
     version_enum.GetFindInfo(&find_data);
     VLOG(1) << "directory found: " << find_data.cFileName;
-    version.reset(Version::GetVersionFromString(find_data.cFileName));
+    version.reset(Version::GetVersionFromString(
+                      WideToASCII(find_data.cFileName)));
     if (version.get() && (latest_version.CompareTo(*version) > 0)) {
       std::vector<FilePath> key_files;
       for (Products::const_iterator it = products_.begin();
diff --git a/chrome/installer/util/package_unittest.cc b/chrome/installer/util/package_unittest.cc
index c456482..e2a9bb6 100644
--- a/chrome/installer/util/package_unittest.cc
+++ b/chrome/installer/util/package_unittest.cc
@@ -39,8 +39,8 @@ TEST_F(PackageTest, Basic) {
   EXPECT_TRUE(package->IsEqual(test_dir_.path()));
   EXPECT_EQ(0U, package->products().size());
 
-  const wchar_t kOldVersion[] = L"1.2.3.4";
-  const wchar_t kNewVersion[] = L"2.3.4.5";
+  const char kOldVersion[] = "1.2.3.4";
+  const char kNewVersion[] = "2.3.4.5";
 
   scoped_ptr<Version> new_version(Version::GetVersionFromString(kNewVersion));
   scoped_ptr<Version> old_version(Version::GetVersionFromString(kOldVersion));
@@ -110,7 +110,7 @@ TEST_F(PackageTest, WithProduct) {
   EXPECT_EQ(1U, package->products().size());
   EXPECT_EQ(system_level, package->system_level());
 
-  const wchar_t kCurrentVersion[] = L"1.2.3.4";
+  const char kCurrentVersion[] = "1.2.3.4";
   scoped_ptr<Version> current_version(
       Version::GetVersionFromString(kCurrentVersion));
 
diff --git a/chrome/installer/util/product_unittest.cc b/chrome/installer/util/product_unittest.cc
index bb72fff..0e928bc 100644
--- a/chrome/installer/util/product_unittest.cc
+++ b/chrome/installer/util/product_unittest.cc
@@ -134,7 +134,7 @@ TEST_F(ProductTest, ProductInstallBasic) {
                        KEY_ALL_ACCESS);
     ASSERT_TRUE(version_key.Valid());
 
-    const wchar_t kCurrentVersion[] = L"1.2.3.4";
+    const char kCurrentVersion[] = "1.2.3.4";
     scoped_ptr<Version> current_version(
         Version::GetVersionFromString(kCurrentVersion));
     version_key.WriteValue(google_update::kRegVersionField,