Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

chrome/browser/search_engines/template_url_prepopulate_data.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/browser/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/scoped_vector.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "grit/theme_resources.h"
 
 #if defined(OS_WIN)
 #undef IN  // On Windows, windef.h defines this, which screws up "India" cases.
 #elif defined(OS_MACOSX)
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #endif
 
 using base::Time;
 
 namespace {
 
 // NOTE: See comments in GetDataVersion() below!  You should probably not change
 // the data in this file without changing the result of that function!
 
 // Engine definitions //////////////////////////////////////////////////////////
@@ skipping 2819 matching lines @@
 
 int GetCurrentCountryID() {
   GEOID geo_id = GetUserGeoID(GEOCLASS_NATION);
 
   return GeoIDToCountryID(geo_id);
 }
 
 #elif defined(OS_MACOSX)
 
 int GetCurrentCountryID() {
-  scoped_cftyperef<CFLocaleRef> locale(CFLocaleCopyCurrent());
+  base::mac::ScopedCFTypeRef<CFLocaleRef> locale(CFLocaleCopyCurrent());
   CFStringRef country = (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]),
@@ skipping 578 matching lines @@
   // the first one.
   GetPrepopulatedEngines(prefs, &loaded_urls.get(), &default_search_index);
   if (default_search_index < loaded_urls.size()) {
     default_search_provider = loaded_urls[default_search_index];
     loaded_urls.weak_erase(loaded_urls.begin() + default_search_index);
   }
   return default_search_provider;
 }
 
 }  // namespace TemplateURLPrepopulateData