diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 18:40:53 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 18:40:53 +0000 |
| commit | 12126d37c6fafd799821164a00bf1fdd240b9ec3 (patch) | |
| tree | 8a029e133da6d9ad82265b03dc930045b3ffd046 /chrome/browser/enumerate_modules_model_win.cc | |
| parent | 26807c6123b72a2ab30ff3fb2d5ab1e154fc3585 (diff) | |
| download | chromium_src-12126d37c6fafd799821164a00bf1fdd240b9ec3.zip chromium_src-12126d37c6fafd799821164a00bf1fdd240b9ec3.tar.gz chromium_src-12126d37c6fafd799821164a00bf1fdd240b9ec3.tar.bz2 | |
Remove two deprecated methods from base::Version
BUG=none
TEST=none
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10683005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/enumerate_modules_model_win.cc')
| -rw-r--r-- | chrome/browser/enumerate_modules_model_win.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 95b24d4..699c003e 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -341,20 +341,17 @@ ModuleEnumerator::ModuleStatus ModuleEnumerator::Match( location_hash == blacklisted.location)) { // We have a name match against the blacklist (and possibly location match // also), so check version. - scoped_ptr<Version> module_version( - Version::GetVersionFromString(UTF16ToASCII(module.version))); - scoped_ptr<Version> version_min( - Version::GetVersionFromString(blacklisted.version_from)); - scoped_ptr<Version> version_max( - Version::GetVersionFromString(blacklisted.version_to)); - bool version_ok = !version_min.get() && !version_max.get(); + Version module_version(UTF16ToASCII(module.version)); + Version version_min(blacklisted.version_from); + Version version_max(blacklisted.version_to); + bool version_ok = !version_min.IsValid() && !version_max.IsValid(); if (!version_ok) { - bool too_low = version_min.get() && - (!module_version.get() || - module_version->CompareTo(*version_min.get()) < 0); - bool too_high = version_max.get() && - (!module_version.get() || - module_version->CompareTo(*version_max.get()) >= 0); + bool too_low = version_min.IsValid() && + (!module_version.IsValid() || + module_version.CompareTo(version_min) < 0); + bool too_high = version_max.IsValid() && + (!module_version.IsValid() || + module_version.CompareTo(version_max) >= 0); version_ok = !too_low && !too_high; } |