Regkey functions return error code instead of bool

chrome/installer/setup/install.cc

Index: chrome/installer/setup/install.cc
===================================================================
--- chrome/installer/setup/install.cc	(revision 71345)
+++ chrome/installer/setup/install.cc	(working copy)
@@ -188,7 +188,7 @@
     // Handle the case where the ClientState key doesn't exist by creating it.
     // This takes care of the multi-installer's package key, which is not
     // created by Google Update for us.
-    if (!key.Open(reg_root, kscan->c_str(), KEY_QUERY_VALUE) ||
+    if (key.Open(reg_root, kscan->c_str(), KEY_QUERY_VALUE) != ERROR_SUCCESS ||
         !other_info.Initialize(key)) {
       other_info.set_value(std::wstring());
     }
@@ -544,11 +544,9 @@
       BrowserDistribution* dist = products[i]->distribution();
       std::wstring version_key(dist->GetVersionKey());
       regular_update_work_items->AddDeleteRegValueWorkItem(root, version_key,
-                                            google_update::kRegOldVersionField,
-                                            REG_SZ);
+                                            google_update::kRegOldVersionField);
       regular_update_work_items->AddDeleteRegValueWorkItem(root, version_key,
-                                            google_update::kRegRenameCmdField,
-                                            REG_SZ);
+                                            google_update::kRegRenameCmdField);
     }
 
     post_install_task_list->AddWorkItem(regular_update_work_items.release());
@@ -1156,7 +1154,7 @@
                KEY_QUERY_VALUE).Valid()) {
       list->AddDeleteRegValueWorkItem(root,
           product.package().properties()->GetStateKey(),
-          installer::kChromeFrameReadyModeField, REG_QWORD);
+          installer::kChromeFrameReadyModeField);
     }
 
     const Product* chrome = installer::FindProduct(product.package().products(),
@@ -1178,16 +1176,13 @@
 
   if (!ready_mode || !install) {
     list->AddDeleteRegValueWorkItem(root, version_key,
-                                    google_update::kRegCFTempOptOutCmdField,
-                                    REG_SZ);
+                                    google_update::kRegCFTempOptOutCmdField);
     list->AddDeleteRegValueWorkItem(root, version_key,
-                                    google_update::kRegCFEndTempOptOutCmdField,
-                                    REG_SZ);
+                                    google_update::kRegCFEndTempOptOutCmdField);
     list->AddDeleteRegValueWorkItem(root, version_key,
-                                    google_update::kRegCFOptOutCmdField,
-                                    REG_SZ);
+                                    google_update::kRegCFOptOutCmdField);
     list->AddDeleteRegValueWorkItem(root, version_key,
-                                    google_update::kRegCFOptInCmdField, REG_SZ);
+                                    google_update::kRegCFOptInCmdField);
   }
 
   if (update_chrome_uninstall_command) {