Create a nicer interface for base::mac::GetValueFromDictionary

base/mac/foundation_util.mm

Index: base/mac/foundation_util.mm
diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
index 8a4ce471765e1157886e293ae4c7b9007ccc24f7..effeb7a9ceb7406895f8ce4faa3c7ae8eec31a65 100644
--- a/base/mac/foundation_util.mm
+++ b/base/mac/foundation_util.mm
@@ -9,7 +9,6 @@
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 
 namespace base {
@@ -200,6 +199,20 @@ FilePath GetAppBundlePath(const FilePath& exec_name) {
   return FilePath();
 }
 
+std::string GetValueFromDictionaryErrorMessage(CFStringRef key,
+                                        CFStringRef expected_type_ref,
+                                        CFTypeRef value) {
+  ScopedCFTypeRef<CFStringRef> actual_type_ref(
+      CFCopyTypeIDDescription(CFGetTypeID(value)));
+  return "Expected value for key "

[Mark Mentovai, 2011/11/13 01:28:22]

http://dev.chromium.org/developers/coding-style#TOC-Code-formatting

“When expressions are wrapped, the operator should be on the end of the broken
line…”

+      + base::SysCFStringRefToUTF8(key)
+      + " to be "
+      + base::SysCFStringRefToUTF8(expected_type_ref)
+      + " but it was "
+      + base::SysCFStringRefToUTF8(actual_type_ref)
+      + " instead";
+}
+
 CFTypeRef GetValueFromDictionary(CFDictionaryRef dict,
                                  CFStringRef key,
                                  CFTypeID expected_type) {
@@ -209,16 +222,10 @@ CFTypeRef GetValueFromDictionary(CFDictionaryRef dict,
 
   if (CFGetTypeID(value) != expected_type) {
     ScopedCFTypeRef<CFStringRef> expected_type_ref(
-        CFCopyTypeIDDescription(expected_type));
-    ScopedCFTypeRef<CFStringRef> actual_type_ref(
-        CFCopyTypeIDDescription(CFGetTypeID(value)));
-    DLOG(WARNING) << "Expected value for key "
-                 << base::SysCFStringRefToUTF8(key)
-                 << " to be "
-                 << base::SysCFStringRefToUTF8(expected_type_ref)
-                 << " but it was "
-                 << base::SysCFStringRefToUTF8(actual_type_ref)
-                 << " instead";
+      CFCopyTypeIDDescription(expected_type));

[Mark Mentovai, 2011/11/13 01:28:22]

Why did you change the correct four-space indent on this line to something else?

[KushalP, 2011/11/13 12:30:27]

I'm not entirely sure. I must have done it manually for some reason because my
Emacs is set to follow the style guide.

+    DLOG(WARNING) << GetValueFromDictionaryErrorMessage(key,
+                                                        expected_type_ref,
+                                                        value);
     return NULL;
   }