Regkey functions return error code instead of bool

chrome/installer/util/package_unittest.cc

Index: chrome/installer/util/package_unittest.cc
===================================================================
--- chrome/installer/util/package_unittest.cc	(revision 70414)
+++ chrome/installer/util/package_unittest.cc	(working copy)
@@ -138,13 +138,14 @@
                            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
 
@@ -210,9 +211,10 @@
     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();
   }
@@ -227,15 +229,18 @@
     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();