Regkey functions return error code instead of bool

chrome_frame/policy_settings.cc

Index: chrome_frame/policy_settings.cc
===================================================================
--- chrome_frame/policy_settings.cc	(revision 70917)
+++ chrome_frame/policy_settings.cc	(working copy)
@@ -69,10 +69,13 @@
   DWORD value = RENDERER_NOT_SPECIFIED;
   std::wstring settings_value(
       ASCIIToWide(policy::key::kChromeFrameRendererSettings));
+  LONG result = ERROR_SUCCESS;
   for (int i = 0; i < arraysize(kRootKeys); ++i) {
-    if (config_key.Open(kRootKeys[i], policy::kRegistrySubKey, KEY_READ) &&
-        config_key.ReadValueDW(settings_value.c_str(), &value)) {
-      break;
+    result = config_key.Open(kRootKeys[i], policy::kRegistrySubKey, KEY_READ);
+    if (result == ERROR_SUCCESS) {
+      result = config_key.ReadValueDW(settings_value.c_str(), &value);
+      if (result == ERROR_SUCCESS)
+        break;
     }
   }
 
@@ -123,11 +126,14 @@
   base::win::RegKey config_key;
   std::wstring application_locale_value(
       ASCIIToWide(policy::key::kApplicationLocaleValue));
+  LONG result = ERROR_SUCCESS;
   for (int i = 0; i < arraysize(kRootKeys); ++i) {
-    if (config_key.Open(kRootKeys[i], policy::kRegistrySubKey, KEY_READ) &&
-        config_key.ReadValue(application_locale_value.c_str(),
-                             application_locale)) {
-      break;
+    result = config_key.Open(kRootKeys[i], policy::kRegistrySubKey, KEY_READ);
+    if (result == ERROR_SUCCESS) {
+      result = config_key.ReadValue(application_locale_value.c_str(),
+                                    application_locale);
+      if (result == ERROR_SUCCESS)
+        break;
     }
   }
 }