base/version: remove wstring version

chrome/installer/util/package.cc

 // 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.
 
 #include "chrome/installer/util/package.h"
 
 #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"
 #include "chrome/installer/util/delete_tree_work_item.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/package_properties.h"
 #include "chrome/installer/util/product.h"
 
 using base::win::RegKey;
@@ skipping 61 matching lines @@
     RegKey chrome_key(root, product->distribution()->GetVersionKey().c_str(),
                       KEY_READ);
     std::wstring version;
     if (new_chrome_exists)
       chrome_key.ReadValue(google_update::kRegOldVersionField, &version);
 
     if (version.empty())
       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)) {
           current_version.reset(this_version.release());
         } else if (current_version.get()) {
           DCHECK_EQ(current_version->GetString(), this_version->GetString())
               << "found distributions of different versions in the same "
                  "installation folder!";
         }
       }
     }
   }
 
   return current_version.release();
 }
 
 void Package::RemoveOldVersionDirectories(
     const Version& latest_version) const {
   file_util::FileEnumerator version_enum(path_, false,
       file_util::FileEnumerator::DIRECTORIES);
   scoped_ptr<Version> version;
 
   // We try to delete all directories whose versions are lower than
   // latest_version.
   FilePath next_version = version_enum.Next();
   while (!next_version.empty()) {
     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();
           it != products_.end(); ++it) {
         BrowserDistribution* dist = it->get()->distribution();
         std::vector<FilePath> dist_key_files(dist->GetKeyFiles());
         std::vector<FilePath>::const_iterator key_file_iter(
             dist_key_files.begin());
         for (; key_file_iter != dist_key_files.end(); ++key_file_iter) {
           key_files.push_back(next_version.Append(*key_file_iter));
@@ skipping 47 matching lines @@
                   << dist->GetApplicationName();
       }
     }
   }
 
   return ret;
 }
 
 }  // namespace installer