Regkey functions return error code instead of bool

chrome/installer/util/package_unittest.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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
@@ skipping 120 matching lines @@
       }
     }
   }
 }
 
 namespace {
 bool SetUninstallArguments(HKEY root, BrowserDistribution* dist,
                            const CommandLine& args) {
   RegKey key(root, dist->GetStateKey().c_str(), KEY_ALL_ACCESS);
   return key.WriteValue(installer::kUninstallArgumentsField,
-                        args.command_line_string().c_str());
+                        args.command_line_string().c_str()) == ERROR_SUCCESS;
 }
 
 bool SetInstalledVersion(HKEY root, BrowserDistribution* dist,
                          const std::wstring& version) {
   RegKey key(root, dist->GetVersionKey().c_str(), KEY_ALL_ACCESS);
-  return key.WriteValue(google_update::kRegVersionField, version.c_str());
+  LONG ret = key.WriteValue(google_update::kRegVersionField, version.c_str());
+  return ret == ERROR_SUCCESS;
 }
 }  // end namespace
 
 TEST_F(PackageTest, Dependency) {
   const bool multi_install = false;
   const bool system_level = true;
   HKEY root = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   TempRegKeyOverride override(root, L"root_dep");
 
   ChromePackageProperties properties;
@@ skipping 45 matching lines @@
   scoped_refptr<Product> product(new Product(distribution, package.get()));
   RegKey key;
   std::wstring launch_cmd = L"hey diddle diddle";
   std::wstring value;
 
   // check results for single Chrome
   {
     TempRegKeyOverride override(root, L"root_inst_res");
     package->WriteInstallerResult(installer::FIRST_INSTALL_SUCCESS, 0,
                                   &launch_cmd);
-    EXPECT_TRUE(key.Open(root, distribution->GetStateKey().c_str(), KEY_READ));
-    EXPECT_TRUE(key.ReadValue(installer::kInstallerSuccessLaunchCmdLine,
-                              &value));
+    EXPECT_EQ(ERROR_SUCCESS,
+        key.Open(root, distribution->GetStateKey().c_str(), KEY_READ));
+    EXPECT_EQ(ERROR_SUCCESS,
+        key.ReadValue(installer::kInstallerSuccessLaunchCmdLine, &value));
     EXPECT_EQ(launch_cmd, value);
     key.Close();
   }
   TempRegKeyOverride::DeleteAllTempKeys();
 
   // check results for multi Chrome
   multi_install = true;
   package = new Package(multi_install, system_level, test_dir_.path(),
                         &properties);
   product = new Product(distribution, package.get());
   {
     TempRegKeyOverride override(root, L"root_inst_res");
     package->WriteInstallerResult(installer::FIRST_INSTALL_SUCCESS, 0,
                                   &launch_cmd);
-    EXPECT_TRUE(key.Open(root, distribution->GetStateKey().c_str(), KEY_READ));
-    EXPECT_TRUE(key.ReadValue(installer::kInstallerSuccessLaunchCmdLine,
-                              &value));
+    EXPECT_EQ(ERROR_SUCCESS,
+        key.Open(root, distribution->GetStateKey().c_str(), KEY_READ));
+    EXPECT_EQ(ERROR_SUCCESS,
+        key.ReadValue(installer::kInstallerSuccessLaunchCmdLine, &value));
     EXPECT_EQ(launch_cmd, value);
-    EXPECT_EQ(properties.ReceivesUpdates(),
-              key.Open(root, properties.GetStateKey().c_str(), KEY_READ));
+    bool receive_update_setting = key.Open(root,
+                                           properties.GetStateKey().c_str(),
+                                           KEY_READ) == ERROR_SUCCESS;
+    EXPECT_EQ(properties.ReceivesUpdates(), receive_update_setting);
     if (properties.ReceivesUpdates()) {
-      EXPECT_TRUE(key.ReadValue(installer::kInstallerSuccessLaunchCmdLine,
-                                &value));
+      EXPECT_EQ(ERROR_SUCCESS,
+          key.ReadValue(installer::kInstallerSuccessLaunchCmdLine, &value));
       EXPECT_EQ(launch_cmd, value);
     }
     key.Close();
   }
   TempRegKeyOverride::DeleteAllTempKeys();
 }