Remove two deprecated methods from base::Version

chrome/installer/util/install_util.cc

 // Copyright (c) 2012 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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
@@ skipping 153 matching lines @@
 
 CommandLine InstallUtil::GetChromeUninstallCmd(
     bool system_install, BrowserDistribution::Type distribution_type) {
   ProductState state;
   if (state.Initialize(system_install, distribution_type)) {
     return state.uninstall_command();
   }
   return CommandLine(CommandLine::NO_PROGRAM);
 }
 
-Version* InstallUtil::GetChromeVersion(BrowserDistribution* dist,
-                                       bool system_install) {
+void InstallUtil::GetChromeVersion(BrowserDistribution* dist,
+                                   bool system_install,
+                                   Version* version) {
   DCHECK(dist);
   RegKey key;
   HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   LONG result = key.Open(reg_root, dist->GetVersionKey().c_str(),
                          KEY_QUERY_VALUE);
 
   string16 version_str;
   if (result == ERROR_SUCCESS)
     result = key.ReadValue(google_update::kRegVersionField, &version_str);
 
-  Version* ret = NULL;
+  *version = Version();
   if (result == ERROR_SUCCESS && !version_str.empty()) {
     VLOG(1) << "Existing " << dist->GetAppShortCutName() << " version found "
             << version_str;
-    ret = Version::GetVersionFromString(WideToASCII(version_str));
+    *version = Version(WideToASCII(version_str));
   } else {
     DCHECK_EQ(ERROR_FILE_NOT_FOUND, result);
     VLOG(1) << "No existing " << dist->GetAppShortCutName()
             << " install found.";
   }
-
-  return ret;
 }
 
-Version* InstallUtil::GetCriticalUpdateVersion(BrowserDistribution* dist,
-                                               bool system_install) {
+void InstallUtil::GetCriticalUpdateVersion(BrowserDistribution* dist,
+                                           bool system_install,
+                                           Version* version) {
   DCHECK(dist);
   RegKey key;
   HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   LONG result =
       key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_QUERY_VALUE);
 
   string16 version_str;
   if (result == ERROR_SUCCESS)
     result = key.ReadValue(google_update::kRegCriticalVersionField,
                            &version_str);
 
-  Version* ret = NULL;
+  *version = Version();
   if (result == ERROR_SUCCESS && !version_str.empty()) {
     VLOG(1) << "Critical Update version for " << dist->GetAppShortCutName()
             << " found " << version_str;
-    ret = Version::GetVersionFromString(WideToASCII(version_str));
+    *version = Version(WideToASCII(version_str));
   } else {
     DCHECK_EQ(ERROR_FILE_NOT_FOUND, result);
     VLOG(1) << "No existing " << dist->GetAppShortCutName()
             << " install found.";
   }
-
-  return ret;
 }
 
 bool InstallUtil::IsOSSupported() {
   // We do not support Win2K or older, or XP without service pack 2.
   VLOG(1) << base::SysInfo::OperatingSystemName() << ' '
           << base::SysInfo::OperatingSystemVersion();
   base::win::Version version = base::win::GetVersion();
   return (version > base::win::VERSION_XP) ||
       ((version == base::win::VERSION_XP) &&
        (base::win::OSInfo::GetInstance()->service_pack().major >= 2));
@@ skipping 103 matching lines @@
 
 bool InstallUtil::IsChromeSxSProcess() {
   static bool sxs = CheckIsChromeSxSProcess();
   return sxs;
 }
 
 bool InstallUtil::HasDelegateExecuteHandler(BrowserDistribution* dist,
                                             const string16& chrome_exe) {
   bool found = false;
   bool system_install = !IsPerUserInstall(chrome_exe.c_str());
-  scoped_ptr<Version> version(GetChromeVersion(dist, system_install));
-  if (!version.get()) {
+  Version version;
+  GetChromeVersion(dist, system_install, &version);
+  if (!version.IsValid()) {
     LOG(ERROR) << __FUNCTION__ << " failed to determine version of "
                << dist->GetAppShortCutName() << " installed at " << chrome_exe;
   } else {
     FilePath handler(
         FilePath(chrome_exe).DirName()
-            .AppendASCII(version->GetString())
+            .AppendASCII(version.GetString())
             .Append(installer::kDelegateExecuteExe));
     found = file_util::PathExists(handler);
   }
   return found;
 }
 
 // This method tries to delete a registry key and logs an error message
 // in case of failure. It returns true if deletion is successful (or the key did
 // not exist), otherwise false.
 bool InstallUtil::DeleteRegistryKey(HKEY root_key,
@@ skipping 176 matching lines @@
   // Open the program and see if it references the expected file.
   base::win::ScopedHandle handle;
   BY_HANDLE_FILE_INFORMATION info = {};
 
   return (OpenForInfo(program, &handle) &&
           GetInfo(handle, &info) &&
           info.dwVolumeSerialNumber == file_info_.dwVolumeSerialNumber &&
           info.nFileIndexHigh == file_info_.nFileIndexHigh &&
           info.nFileIndexLow == file_info_.nFileIndexLow);
 }