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

base/mac/foundation_util.mm

 // Copyright (c) 2011 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 "base/mac/foundation_util.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 
 namespace base {
 namespace mac {
 
 static bool g_override_am_i_bundled = false;
 static bool g_override_am_i_bundled_value = false;
 
 // Adapted from http://developer.apple.com/carbon/tipsandtricks.html#AmIBundled
 static bool UncachedAmIBundled() {
@@ skipping 170 matching lines @@
         !it->compare(it->length() - kExtLength, kExtLength, kExt, kExtLength))
       return FilePath(bundle_name);
 
     // Separate this component from the next one.
     bundle_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) {
   CFTypeRef value = CFDictionaryGetValue(dict, key);
   if (!value)
     return value;
 
   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;
   }
 
   return value;
 }
 
 void NSObjectRetain(void* obj) {
   id<NSObject> nsobj = static_cast<id<NSObject> >(obj);
   [nsobj retain];
 }
@@ skipping 133 matching lines @@
         CFDictionaryGetValue(user_info.get(), kCFErrorDescriptionKey));
   }
   o << "Code: " << CFErrorGetCode(err)
     << " Domain: " << CFErrorGetDomain(err)
     << " Desc: " << desc.get();
   if(errorDesc) {
     o << "(" << errorDesc << ")";
   }
   return o;
 }