mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

chrome/browser/search_engines/template_url_prepopulate_data.cc

Index: chrome/browser/search_engines/template_url_prepopulate_data.cc
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index 07438a9d2675ecb8dedff0b2fcb4b07a02a5be08..0f35035f8ed155b845e8c0e63ba7b570e17151de 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -618,9 +618,9 @@ int GetCurrentCountryID() {
 #elif defined(OS_MACOSX)
 
 int GetCurrentCountryID() {
-  base::mac::ScopedCFTypeRef<CFLocaleRef> locale(CFLocaleCopyCurrent());
-  CFStringRef country = (CFStringRef)CFLocaleGetValue(locale.get(),
-                                                      kCFLocaleCountryCode);
+  base::ScopedCFTypeRef<CFLocaleRef> locale(CFLocaleCopyCurrent());
+  CFStringRef country =

[Mark Mentovai, 2013/06/21 20:29:40]

The only reason I can see that this was touched is that it’s right next to a
line in the diff. But it shouldn’t have otherwise been a ± line in the diff on
its own, so why was it touched?

[Nico, 2013/06/21 21:09:06]

Huh, this is strange. Looking…

I think this is a bug in git-clang-format. Asked here:
http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130617/082383.html

+      (CFStringRef)CFLocaleGetValue(locale.get(), kCFLocaleCountryCode);
   if (!country)
     return kCountryIDUnknown;