Use InstallUtil::GetChromeVersion() to retrieve version number.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/8451016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108588 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 13 deletions

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index 79d20a3..a3f3eb0 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -663,20 +663,14 @@ FilePath ChromeMiniInstaller::GetStartMenuShortcutPath() {
   return path_name;
 }
 
-// Returns Chrome pv registry key value
-bool ChromeMiniInstaller::GetChromeVersionFromRegistry(
-    std::string* build_key_value) {
+bool ChromeMiniInstaller::GetChromeVersionFromRegistry(std::string* value) {
   BrowserDistribution* dist = GetCurrentBrowserDistribution();
-  RegKey key(GetRootRegistryKey(), dist->GetVersionKey().c_str(), KEY_READ);
-  std::wstring value;
-  LONG result = key.ReadValue(L"pv", &value);
-  if (result != ERROR_SUCCESS) {
-    LOG(WARNING) << "Registry read for Chrome version error: " << result;
+  scoped_ptr<Version> version(
+      InstallUtil::GetChromeVersion(dist, system_install_));
+  if (!version.get())
     return false;
-  }
-  *build_key_value = WideToASCII(value);
-  LOG(INFO) << "Build key value is " << build_key_value;
-  return true;
+  *value = version->GetString();
+  return !value->empty();
 }
 
 // Get HKEY based on install type.
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.h b/chrome/test/mini_installer_test/chrome_mini_installer.h
index a0b3d65a..1972c2b 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.h
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.h
@@ -104,7 +104,7 @@ class ChromeMiniInstaller {
   HKEY GetRootRegistryKey();
 
   // Returns Chrome pv registry key value.
-  bool GetChromeVersionFromRegistry(std::string* reg_key_value);
+  bool GetChromeVersionFromRegistry(std::string* value);
 
   // This method gets the shortcut path from start menu based on install type.
   FilePath GetStartMenuShortcutPath();