Index: chrome/browser/first_run/upgrade_util_win.cc |
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc |
index a4fc3b06d9ef4fed983f222b59aab8d4bd6d59bc..834a9790a0fdde336dc60a0e5d1e08fd8ca1ca56 100644 |
--- a/chrome/browser/first_run/upgrade_util_win.cc |
+++ b/chrome/browser/first_run/upgrade_util_win.cc |
@@ -105,16 +105,14 @@ bool SwapNewChromeExeIfPresent() { |
if (cmd_line.HasSwitch(switches::kChromeVersion)) { |
std::string version_string = |
cmd_line.GetSwitchValueASCII(switches::kChromeVersion); |
- scoped_ptr<Version> cmd_version( |
- Version::GetVersionFromString(version_string)); |
+ Version cmd_version(version_string); |
std::wstring pv_value; |
if (key.ReadValue(google_update::kRegVersionField, |
&pv_value) == ERROR_SUCCESS) { |
- scoped_ptr<Version> pv_version( |
- Version::GetVersionFromString(WideToASCII(pv_value))); |
- if (cmd_version.get() && pv_version.get() && |
- !cmd_version->Equals(*pv_version.get())) { |
+ Version pv_version(WideToASCII(pv_value)); |
+ if (cmd_version.IsValid() && pv_version.IsValid() && |
+ !cmd_version.Equals(pv_version)) { |
return false; |
} |
} |