Regkey functions return error code instead of bool

chrome_frame/crash_reporting/crash_metrics.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/crash_reporting/crash_metrics.h"
 
 #include "base/metrics/histogram.h"
 #include "base/win/registry.h"
 #include "chrome_frame/utils.h"
 
@@ skipping 12 matching lines @@
 };
 
 CrashMetricsReporter* CrashMetricsReporter::GetInstance() {
   return &g_crash_metrics_instance_.Get();
 }
 
 bool CrashMetricsReporter::SetMetric(Metric metric, int value) {
   DCHECK(metric >= NAVIGATION_COUNT && metric <= LAST_METRIC);
 
   base::win::RegKey metric_key;
-  if (metric_key.Create(HKEY_CURRENT_USER, kChromeFrameMetricsKey,
-                        KEY_SET_VALUE)) {
-    if (metric_key.WriteValue(g_metric_names[metric], value)) {
+  LONG result = metric_key.Create(HKEY_CURRENT_USER, kChromeFrameMetricsKey,
+                                  KEY_SET_VALUE);

[robertshield, 2011/01/12 15:01:34]

nit: the temporary here makes this harder to read imho, consider formatting it
similarly to GetMetric() a few lines down.

+  if (result == ERROR_SUCCESS) {
+    result = metric_key.WriteValue(g_metric_names[metric], value);
+    if (result == ERROR_SUCCESS) {
       return true;
     } else {
       DLOG(ERROR) << "Failed to read ChromeFrame metric:"
-                  << g_metric_names[metric];
+        << g_metric_names[metric] << " error: " << result;
     }
   } else {
-    DLOG(ERROR) << "Failed to create ChromeFrame metrics key";
+    DLOG(ERROR) << "Failed to create ChromeFrame metrics key. error: "
+                << result;
   }
   return false;
 }
 
 int CrashMetricsReporter::GetMetric(Metric metric) {
   DCHECK(metric >= NAVIGATION_COUNT && metric <= LAST_METRIC);
 
   int ret = 0;
   base::win::RegKey metric_key;
   if (metric_key.Open(HKEY_CURRENT_USER, kChromeFrameMetricsKey,
-                      KEY_QUERY_VALUE)) {
-    int value = 0;
-    if (metric_key.ReadValueDW(g_metric_names[metric],
-                               reinterpret_cast<DWORD*>(&value))) {
-      ret = value;
-    }
+                      KEY_QUERY_VALUE) == ERROR_SUCCESS) {
+    metric_key.ReadValueDW(g_metric_names[metric],
+                           reinterpret_cast<DWORD*>(&ret));
   }
+
   return ret;
 }
 
 int CrashMetricsReporter::IncrementMetric(Metric metric) {
   DCHECK(metric >= NAVIGATION_COUNT && metric <= LAST_METRIC);
   int metric_value = GetMetric(metric);
   metric_value++;
   SetMetric(metric, metric_value);
   return metric_value;
 }
@@ skipping 20 matching lines @@
     SetMetric(CRASH_COUNT, 0);
   }
 
   int channel_error_count = GetMetric(CHANNEL_ERROR_COUNT);
   if (channel_error_count > 0) {
     THREAD_SAFE_UMA_HISTOGRAM_COUNTS("ChromeFrame.ChannelErrorCount",
                                       channel_error_count);
     SetMetric(CHANNEL_ERROR_COUNT, 0);
   }
 }