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

chrome/browser/search_engines/template_url_prepopulate_data.cc

 // Copyright (c) 2012 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/browser/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 600 matching lines @@
 
 int GetCurrentCountryID() {
   GEOID geo_id = GetUserGeoID(GEOCLASS_NATION);
 
   return GeoIDToCountryID(geo_id);
 }
 
 #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;
 
   UniChar isobuf[2];
   CFRange char_range = CFRangeMake(0, 2);
   CFStringGetCharacters(country, char_range, isobuf);
 
   return CountryCharsToCountryIDWithUpdate(static_cast<char>(isobuf[0]),
                                            static_cast<char>(isobuf[1]));
 }
@@ skipping 667 matching lines @@
 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) {
   if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) {
     return GURL((size == LOGO_200_PERCENT) ?
                 google_logos.logo_200_percent_url :
                 google_logos.logo_100_percent_url);
   }
   return GURL();
 }
 
 }  // namespace TemplateURLPrepopulateData