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

base/sys_string_conversions_mac.mm

 // Copyright (c) 2006-2008 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/sys_string_conversions.h"
 
 #import <Foundation/Foundation.h>
 
 #include <vector>
 
 #include "base/foundation_utils_mac.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/string_piece.h"
 
 namespace base {
 
 namespace {
 
 // Convert the supplied CFString into the specified encoding, and return it as
 // an STL string of the template type.  Returns an empty string on failure.
 //
 // Do not assert in this function since it is used by the asssertion code!
@@ skipping 48 matching lines @@
 // Do not assert in this function since it is used by the asssertion code!
 template<typename InStringType, typename OutStringType>
 static OutStringType STLStringToSTLStringWithEncodingsT(
     const InStringType& in,
     CFStringEncoding in_encoding,
     CFStringEncoding out_encoding) {
   typename InStringType::size_type in_length = in.length();
   if (in_length == 0)
     return OutStringType();
 
-  scoped_cftyperef<CFStringRef> cfstring(
+  base::mac::ScopedCFTypeRef<CFStringRef> cfstring(
       CFStringCreateWithBytesNoCopy(NULL,
                                     reinterpret_cast<const UInt8*>(in.data()),
                                     in_length *
                                       sizeof(typename InStringType::value_type),
                                     in_encoding,
                                     false,
                                     kCFAllocatorNull));
   if (!cfstring)
     return OutStringType();
 
@@ skipping 103 matching lines @@
   return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring));
 }
 
 std::wstring SysNSStringToWide(NSString* nsstring) {
   if (!nsstring)
     return std::wstring();
   return SysCFStringRefToWide(reinterpret_cast<CFStringRef>(nsstring));
 }
 
 }  // namespace base