Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1703)

Unified Diff: chrome/common/service_process_util_mac.mm

Issue 10683005: Remove two deprecated methods from base::Version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/service_process_util.cc ('k') | chrome/installer/setup/install_worker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/service_process_util_mac.mm
diff --git a/chrome/common/service_process_util_mac.mm b/chrome/common/service_process_util_mac.mm
index 72f0f217452088908a5ccad7554be0563cd1df02..858beec7fb22e1673f1d598acec717157935b84b 100644
--- a/chrome/common/service_process_util_mac.mm
+++ b/chrome/common/service_process_util_mac.mm
@@ -205,27 +205,26 @@ bool CheckServiceProcessReady() {
if (!GetServiceProcessData(&version, &pid)) {
return false;
}
- scoped_ptr<Version> service_version(Version::GetVersionFromString(version));
+ Version service_version(version);
bool ready = true;
- if (!service_version.get()) {
+ if (!service_version.IsValid()) {
ready = false;
} else {
chrome::VersionInfo version_info;
if (!version_info.is_valid()) {
// Our own version is invalid. This is an error case. Pretend that we
// are out of date.
- NOTREACHED() << "Failed to get current file version";
+ NOTREACHED();
ready = true;
}
else {
- scoped_ptr<Version> running_version(Version::GetVersionFromString(
- version_info.Version()));
- if (!running_version.get()) {
+ Version running_version(version_info.Version());
+ if (!running_version.IsValid()) {
// Our own version is invalid. This is an error case. Pretend that we
// are out of date.
- NOTREACHED() << "Failed to parse version info";
+ NOTREACHED();
ready = true;
- } else if (running_version->CompareTo(*service_version) > 0) {
+ } else if (running_version.CompareTo(service_version) > 0) {
ready = false;
} else {
ready = true;
« no previous file with comments | « chrome/common/service_process_util.cc ('k') | chrome/installer/setup/install_worker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698