Regkey functions return error code instead of bool

chrome/test/mini_installer_test/chrome_mini_installer.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/test/mini_installer_test/chrome_mini_installer.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process.h"
@@ skipping 347 matching lines @@
   if (base::GetProcessCount(installer::kNaClExe, NULL) > 0) {
     printf("NaCl.exe is still running even after closing all windows\n");
     return false;
   }
   return true;
 }
 
 // Checks for Chrome registry keys.
 bool ChromeMiniInstaller::CheckRegistryKey(const std::wstring& key_path) {
   RegKey key;
-  if (!key.Open(GetRootRegistryKey(), key_path.c_str(), KEY_ALL_ACCESS)) {
-    printf("Cannot open reg key\n");
+  LONG ret = key.Open(GetRootRegistryKey(), key_path.c_str(), KEY_ALL_ACCESS);
+  if (ret != ERROR_SUCCESS) {
+    printf("Cannot open reg key. error: %d\n", ret);
     return false;
   }
   std::wstring reg_key_value_returned;
   if (!GetChromeVersionFromRegistry(&reg_key_value_returned))
     return false;
   return true;
 }
 
 // Checks for Chrome registry keys on uninstall.
 bool ChromeMiniInstaller::CheckRegistryKeyOnUninstall(
     const std::wstring& key_path) {
   RegKey key;
   int timer = 0;
-  while ((key.Open(GetRootRegistryKey(), key_path.c_str(), KEY_ALL_ACCESS)) &&
+  while ((key.Open(GetRootRegistryKey(), key_path.c_str(),
+                   KEY_ALL_ACCESS) == ERROR_SUCCESS) &&
          (timer < 20000)) {
     base::PlatformThread::Sleep(200);
     timer = timer + 200;
   }
   return CheckRegistryKey(key_path);
 }
 
 // Deletes Installer folder from Applications directory.
 void ChromeMiniInstaller::DeleteFolder(const wchar_t* folder_name) {
   FilePath install_path(GetChromeInstallDirectoryLocation());
@@ skipping 43 matching lines @@
 
 // Deletes pv key from Clients.
 void ChromeMiniInstaller::DeletePvRegistryKey() {
   std::wstring pv_key(google_update::kRegPathClients);
   pv_key.append(L"\\");
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   pv_key.append(dist->GetAppGuid());
 
   RegKey key;
-  if (key.Open(GetRootRegistryKey(), pv_key.c_str(), KEY_ALL_ACCESS))
-    ASSERT_TRUE(key.DeleteValue(L"pv"));
+  if (key.Open(GetRootRegistryKey(), pv_key.c_str(), KEY_ALL_ACCESS)
+      == ERROR_SUCCESS)

[grt (UTC plus 2), 2011/01/16 04:19:48]

Wrapping

[amit, 2011/01/16 07:54:28]

Done.

+    ASSERT_EQ(ERROR_SUCCESS, key.DeleteValue(L"pv"));
   printf("Deleted %ls key\n", pv_key.c_str());
 }
 
 // Verifies if Chrome shortcut exists.
 void ChromeMiniInstaller::FindChromeShortcut() {
   bool return_val = false;
   FilePath uninstall_lnk;
   FilePath path = GetStartMenuShortcutPath();
   path = path.Append(mini_installer_constants::kChromeBuildType);
   // Verify if path exists.
@@ skipping 57 matching lines @@
   }
   printf("uninstall path is %ls\n", path.c_str());
   return path;
 }
 
 // Returns Chrome pv registry key value
 bool ChromeMiniInstaller::GetChromeVersionFromRegistry(
     std::wstring* build_key_value) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   RegKey key(GetRootRegistryKey(), dist->GetVersionKey().c_str(), KEY_READ);
-  if (!key.ReadValue(L"pv", build_key_value)) {
-    printf("registry key not found\n");
+  LONG result = key.ReadValue(L"pv", build_key_value);
+  if (result != ERROR_SUCCESS) {
+    printf("registry read for chrome version failed. error: %d\n", result);
     return false;
   }
   printf("Build key value is %ls\n\n", build_key_value->c_str());
   return true;
 }
 
 // Get HKEY based on install type.
 HKEY ChromeMiniInstaller::GetRootRegistryKey() {
   HKEY type = HKEY_CURRENT_USER;
   if (install_type_ == mini_installer_constants::kSystemInstall)
@@ skipping 138 matching lines @@
 // This method will verify if the installed build is correct.
 bool ChromeMiniInstaller::VerifyStandaloneInstall() {
   std::wstring reg_key_value_returned, standalone_installer_version;
   MiniInstallerTestUtil::GetStandaloneVersion(&standalone_installer_version);
   GetChromeVersionFromRegistry(&reg_key_value_returned);
   if (standalone_installer_version.compare(reg_key_value_returned) == 0)
     return true;
   else
     return false;
 }