| Index: chrome/browser/component_updater/pnacl_component_installer.cc
|
| diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc
|
| index 93b2611340aed7989c46ff4d87528f4661a3ed95..6c47ea134938b94bc6d0810a7978befc210a0139 100644
|
| --- a/chrome/browser/component_updater/pnacl_component_installer.cc
|
| +++ b/chrome/browser/component_updater/pnacl_component_installer.cc
|
| @@ -77,8 +77,9 @@ volatile base::subtle::Atomic32 needs_on_demand_update = 0;
|
| void CheckVersionCompatiblity(const base::Version& current_version) {
|
| // Using NoBarrier, since needs_on_demand_update is standalone and does
|
| // not have other associated data.
|
| - base::subtle::NoBarrier_Store(&needs_on_demand_update,
|
| - current_version.IsOlderThan(kMinPnaclVersion));
|
| + base::subtle::NoBarrier_Store(
|
| + &needs_on_demand_update,
|
| + current_version < base::Version(kMinPnaclVersion));
|
| }
|
|
|
| // PNaCl is packaged as a multi-CRX. This returns the platform-specific
|
| @@ -272,7 +273,7 @@ bool PnaclComponentInstaller::Install(const base::DictionaryValue& manifest,
|
| // |installed_file| actually exists.
|
| bool PnaclComponentInstaller::GetInstalledFile(const std::string& file,
|
| base::FilePath* installed_file) {
|
| - if (current_version().Equals(Version(kNullVersion)))
|
| + if (current_version() == Version(kNullVersion))
|
| return false;
|
|
|
| *installed_file = GetPnaclBaseDirectory()
|
| @@ -339,7 +340,7 @@ void StartPnaclUpdateRegistration(
|
| !CheckPnaclComponentManifest(*manifest,
|
| *pnacl_manifest,
|
| &manifest_version) ||
|
| - !current_version.Equals(manifest_version)) {
|
| + current_version != manifest_version) {
|
| current_version = Version(kNullVersion);
|
| } else {
|
| OverrideDirPnaclComponent(path);
|
|
|