Regkey functions return error code instead of bool

chrome_frame/policy_settings.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_frame/policy_settings.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 51 matching lines @@
   DCHECK(default_renderer);
   DCHECK(renderer_exclusion_list);
 
   *default_renderer = RENDERER_NOT_SPECIFIED;
   renderer_exclusion_list->clear();
 
   base::win::RegKey config_key;
   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;
     }
   }
 
   DCHECK(value == RENDERER_NOT_SPECIFIED ||
          value == RENDER_IN_HOST ||
          value == RENDER_IN_CHROME_FRAME) <<
       "invalid default renderer setting: " << value;
 
   if (value != RENDER_IN_HOST && value != RENDER_IN_CHROME_FRAME) {
     DVLOG(1) << "default renderer not specified via policy";
@@ skipping 30 matching lines @@
 
 // static
 void PolicySettings::ReadApplicationLocaleSetting(
     std::wstring* application_locale) {
   DCHECK(application_locale);
 
   application_locale->clear();
   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;
     }
   }
 }
 
 void PolicySettings::RefreshFromRegistry() {
   RendererForUrl default_renderer;
   std::vector<std::wstring> renderer_exclusion_list;
   std::vector<std::wstring> content_type_list;
   std::wstring application_locale;
 
   // Read the latest settings from the registry
   ReadUrlSettings(&default_renderer, &renderer_exclusion_list);
   ReadContentTypeSetting(&content_type_list);
   ReadApplicationLocaleSetting(&application_locale);
 
   // Nofail swap in the new values.  (Note: this is all that need be protected
   // under a mutex if/when this becomes thread safe.)
   using std::swap;
 
   swap(default_renderer_, default_renderer);
   swap(renderer_exclusion_list_, renderer_exclusion_list);
   swap(content_type_list_, content_type_list);
   swap(application_locale_, application_locale);
 }
 
 // static
 PolicySettings* PolicySettings::GetInstance() {
   return Singleton<PolicySettings>::get();
 }